From 55dda5c2908390409f0b3d76cae0c5a02d82c57e Mon Sep 17 00:00:00 2001 From: David Santos Date: Fri, 19 Jan 2024 10:10:25 +0000 Subject: [PATCH 01/40] chore: Enable javascript builds with ES2015+ syntax [BACKLOG-40011] --- .eslintignore | 13 + .eslintrc.json | 34 +- .gitignore | 1 + .prettierignore | 13 + .prettierrc | 4 + .puppeteerrc.js | 6 + README.md | 12 +- impl/client/pom.xml | 7 +- .../assembly/dependencies-js-assembly.xml | 2 +- .../src/main/config/javascript/build.js | 35 +- .../test/config/javascript/karma.ci.conf.js | 65 +- .../config/javascript/karma.headless.conf.js | 64 + package-lock.json | 12640 +++++++++++----- package.json | 33 +- 14 files changed, 9080 insertions(+), 3849 deletions(-) create mode 100644 .eslintignore create mode 100644 .prettierignore create mode 100644 .prettierrc create mode 100644 .puppeteerrc.js create mode 100644 impl/client/src/test/config/javascript/karma.headless.conf.js diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 0000000000..8be410c2c3 --- /dev/null +++ b/.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 diff --git a/.eslintrc.json b/.eslintrc.json index 61166564a5..5c3c46920e 100644 --- a/.eslintrc.json +++ b/.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" } } diff --git a/.gitignore b/.gitignore index 47ca8d0651..5c3ce9ff72 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ bin /impl/server/pentaho.log docs/.jekyll-metadata docs/_site +.eslintcache diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000000..8be410c2c3 --- /dev/null +++ b/.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 diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000000..12c91d0119 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,4 @@ +{ + "printWidth": 100, + "trailingComma": "es5" +} diff --git a/.puppeteerrc.js b/.puppeteerrc.js new file mode 100644 index 0000000000..33170a2465 --- /dev/null +++ b/.puppeteerrc.js @@ -0,0 +1,6 @@ +const { join } = require("path"); + +module.exports = { + // Changes the location where Puppeteer will install Chrome. + cacheDirectory: join(__dirname, "target"), +}; diff --git a/README.md b/README.md index ad4593357e..7468016906 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,17 @@ -# Common-UI # +
+ +# 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) + +
+ How to build -------------- diff --git a/impl/client/pom.xml b/impl/client/pom.xml index 86c86100e0..4efd704f58 100644 --- a/impl/client/pom.xml +++ b/impl/client/pom.xml @@ -19,7 +19,7 @@ for each of the constituents (e.g. vizapi, prompting) of the current artifact. - dojo-release,requirejs,jquery,jquery-i18n-properties,pentaho-cdf-js,angular,angular-animate,angular-i18n,uirouter__core,uirouter__angularjs,echarts + dojo-release,prantlf__requirejs,jquery,jquery-i18n-properties,pentaho-cdf-js,angular,angular-animate,angular-i18n,uirouter__core,uirouter__angularjs,echarts target/js-reports jsdoc-vizapi.json @@ -30,6 +30,9 @@ **/*-require-js-cfg.js ${build.dependenciesDirectory}/META-INF/resources/webjars + v16.20.2 + 8.19.4 + @@ -98,6 +99,11 @@ echarts ${echarts.version} + + org.webjars.npm + dompurify + ${dompurify.version} + From db0b0f5471322625c8843732884eb2d8fcaa62aa Mon Sep 17 00:00:00 2001 From: AAravind27 Date: Thu, 4 Jul 2024 19:35:20 +0530 Subject: [PATCH 22/40] [BACKLOG-41392] fix: show formatted value in legend for gauge --- .../web/pentaho/visual/views/echarts/Gauge.js | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/impl/client/src/main/javascript/web/pentaho/visual/views/echarts/Gauge.js b/impl/client/src/main/javascript/web/pentaho/visual/views/echarts/Gauge.js index 5638d53597..ce45a7e461 100644 --- a/impl/client/src/main/javascript/web/pentaho/visual/views/echarts/Gauge.js +++ b/impl/client/src/main/javascript/web/pentaho/visual/views/echarts/Gauge.js @@ -199,13 +199,16 @@ define([ var bandWidthHorizontal = bandPercent * stepWidthHorizontal; var detailWidthHorizontal = stepWidthHorizontal * 0.7; var offsetCenterX0 = -innerWidth / 2 + bandWidthHorizontal / 2; + var formattedValueMap = {}; for (var i = 0; i < rowCount; i++) { - offsetCenterX = offsetCenterX0 + stepWidthHorizontal * i + offsetCenterX = offsetCenterX0 + stepWidthHorizontal * i; + var measureValue = dataTable.getValue(i, measureColIndex); + formattedValueMap[measureValue] = dataTable.getFormattedValue(i, measureColIndex); records.push({ name: dataTable.getCompositeFormattedValue(i, categoriesColIndexes, self.groupedLabelSeparator), - value: dataTable.getValue(i, measureColIndex), + value: measureValue, tooltip: self._buildTooltip(self._buildRowTooltipHtml(dataTable, i), font), vars: {"rows": self._getCellsValues(dataTable.getRowCells(i, categoriesColIndexes))}, title: { @@ -216,7 +219,10 @@ define([ detail: { offsetCenter: [offsetCenterX, (offsetCenterYPercent + 15) + "%"], width: detailWidthHorizontal, - backgroundColor: bgColorDetail[i] + backgroundColor: bgColorDetail[i], + formatter: function (value) { + return formattedValueMap[value]; + } } }); } @@ -229,13 +235,16 @@ define([ var bandWidthVertical = bandPercent * stepWidthVertical; var detailWidthVertical = stepWidthVertical * 0.8; var offsetCenterY0 = -innerHeight / 2 + bandWidthVertical / 2; + var formattedValueMap = {}; for (var i = 0; i < rowCount; i++) { offsetCenterY = offsetCenterY0 + stepWidthVertical * i; + var measureValue = dataTable.getValue(i, measureColIndex); + formattedValueMap[measureValue] = dataTable.getFormattedValue(i, measureColIndex); records.push({ name: dataTable.getCompositeFormattedValue(i, categoriesColIndexes, self.groupedLabelSeparator), - value: dataTable.getValue(i, measureColIndex), + value: measureValue, tooltip: self._buildTooltip(self._buildRowTooltipHtml(dataTable, i), font), vars: {"rows": self._getCellsValues(dataTable.getRowCells(i, categoriesColIndexes))}, title: { @@ -246,7 +255,10 @@ define([ detail: { offsetCenter: [(offsetCenterXPercent + 40) + "%", offsetCenterY], width: detailWidthVertical, - backgroundColor: bgColorDetail[i] + backgroundColor: bgColorDetail[i], + formatter: function (value) { + return formattedValueMap[value]; + } } }); } From 43f8ae88b315f24c9fdcaa4bccfca2f6f1057e77 Mon Sep 17 00:00:00 2001 From: AAravind27 Date: Fri, 5 Jul 2024 16:49:53 +0530 Subject: [PATCH 23/40] [BACKLOG-41380] fix: show formatted value in tooltip for radar --- .../web/pentaho/visual/views/echarts/Radar.js | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/impl/client/src/main/javascript/web/pentaho/visual/views/echarts/Radar.js b/impl/client/src/main/javascript/web/pentaho/visual/views/echarts/Radar.js index fac0b27cff..0491215ea8 100644 --- a/impl/client/src/main/javascript/web/pentaho/visual/views/echarts/Radar.js +++ b/impl/client/src/main/javascript/web/pentaho/visual/views/echarts/Radar.js @@ -17,8 +17,9 @@ define([ "pentaho/module!_", "./Abstract", "pentaho/data/TableView", - "pentaho/util/object" -], function(module, BaseView, TableView, O) { + "pentaho/util/object", + "pentaho/visual/util" +], function(module, BaseView, TableView, O, util) { "use strict"; @@ -147,6 +148,11 @@ define([ return indicators; }, + _buildRadarTooltip: function(tooltipString) { + var font = util.getDefaultFont(null, 12); + return this._buildTooltip(tooltipString, font); + }, + _buildRadarRecords: function(dataTable, visualData, radarIndicators) { var records = []; @@ -183,6 +189,14 @@ define([ rowIndexes: rowIndexes }; + function escapeHTML(str) { + var elem = document.createElement("e"); + elem.appendChild(document.createTextNode(str)); + return elem.innerHTML; + } + + var tooltipString = record.name !== "" ? (escapeHTML(record.name) + "
") : ""; + // Given that series x category together form the // [visual key]{@link pentaho.visual.role.AbstractPropertyType#isVisualKey}, // there can be a single data row per series and category combination. @@ -210,9 +224,12 @@ define([ : ""; values.push(value); labels.push(label); + tooltipString = tooltipString + escapeHTML(indicator.name) + " : " + escapeHTML(label) + "
"; rowIndexes.push(rowIndex); }); + record.tooltip = this._buildRadarTooltip(tooltipString); + return record; } From 4f7bb15adfe8030f0cfb60bb03e7f93d8b27ad33 Mon Sep 17 00:00:00 2001 From: buildguy Date: Mon, 8 Jul 2024 17:58:33 -0400 Subject: [PATCH 24/40] [CLEANUP] updated versions via release version merger --- assemblies/client-config/pom.xml | 4 ++-- assemblies/npmpackage/pom.xml | 2 +- assemblies/platform-plugin/pom.xml | 8 ++++---- assemblies/pom.xml | 4 ++-- assemblies/webpackage/pom.xml | 2 +- impl/client-config/client-config/pom.xml | 4 ++-- impl/client-config/folder-enabler/pom.xml | 4 ++-- impl/client-config/pom.xml | 4 ++-- impl/client/pom.xml | 4 ++-- impl/pom.xml | 4 ++-- impl/server/pom.xml | 20 ++++++++++---------- pom.xml | 6 +++--- 12 files changed, 33 insertions(+), 33 deletions(-) diff --git a/assemblies/client-config/pom.xml b/assemblies/client-config/pom.xml index d25ba27106..46e9b951f7 100644 --- a/assemblies/client-config/pom.xml +++ b/assemblies/client-config/pom.xml @@ -5,10 +5,10 @@ org.pentaho common-ui-assemblies - 10.2.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT common-ui-client-config - 10.2.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT feature Client config folder Ensures the client's configuration deploy folder is enabled. diff --git a/assemblies/npmpackage/pom.xml b/assemblies/npmpackage/pom.xml index b175be7d94..25df587a6d 100644 --- a/assemblies/npmpackage/pom.xml +++ b/assemblies/npmpackage/pom.xml @@ -6,7 +6,7 @@ org.pentaho common-ui-assemblies - 10.2.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT diff --git a/assemblies/platform-plugin/pom.xml b/assemblies/platform-plugin/pom.xml index 7226c90615..1cf20b1e66 100644 --- a/assemblies/platform-plugin/pom.xml +++ b/assemblies/platform-plugin/pom.xml @@ -5,11 +5,11 @@ org.pentaho common-ui-assemblies - 10.2.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT pentaho common-ui - 10.2.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT pom Common-UI Platform Plugin @@ -33,8 +33,8 @@ 2.1 - 10.2.0.0-SNAPSHOT - 10.2.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT diff --git a/assemblies/pom.xml b/assemblies/pom.xml index 652c9da73c..e31c25311f 100644 --- a/assemblies/pom.xml +++ b/assemblies/pom.xml @@ -5,10 +5,10 @@ org.pentaho common-ui - 10.2.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT common-ui-assemblies - 10.2.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT pom Common-UI assemblies diff --git a/assemblies/webpackage/pom.xml b/assemblies/webpackage/pom.xml index cb1dc9b961..1d8184753f 100644 --- a/assemblies/webpackage/pom.xml +++ b/assemblies/webpackage/pom.xml @@ -6,7 +6,7 @@ org.pentaho common-ui-assemblies - 10.2.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT common-ui-webpackage diff --git a/impl/client-config/client-config/pom.xml b/impl/client-config/client-config/pom.xml index 3ac24ba54a..bf17d30e2e 100644 --- a/impl/client-config/client-config/pom.xml +++ b/impl/client-config/client-config/pom.xml @@ -7,11 +7,11 @@ org.pentaho common-ui-impl-client-config-umbrella - 10.2.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT common-ui-impl-client-config - 10.2.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT configuration-bundle diff --git a/impl/client-config/folder-enabler/pom.xml b/impl/client-config/folder-enabler/pom.xml index 9829fac57b..637382f6d6 100644 --- a/impl/client-config/folder-enabler/pom.xml +++ b/impl/client-config/folder-enabler/pom.xml @@ -5,10 +5,10 @@ org.pentaho common-ui-impl-client-config-umbrella - 10.2.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT common-ui-impl-client-config-folder-enabler - 10.2.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT bundle 1.8.8 diff --git a/impl/client-config/pom.xml b/impl/client-config/pom.xml index f18712f02a..aaf0339030 100644 --- a/impl/client-config/pom.xml +++ b/impl/client-config/pom.xml @@ -5,10 +5,10 @@ org.pentaho common-ui-impl - 10.2.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT common-ui-impl-client-config-umbrella - 10.2.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT pom client-config diff --git a/impl/client/pom.xml b/impl/client/pom.xml index 0e4ededa72..476f1db9b8 100644 --- a/impl/client/pom.xml +++ b/impl/client/pom.xml @@ -7,11 +7,11 @@ org.pentaho common-ui-impl - 10.2.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT common-ui-impl-client - 10.2.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT Common UI client side This artifact is a temporary container for all client side code that either was produced by pentaho or diff --git a/impl/pom.xml b/impl/pom.xml index 183c8d3e6b..c24ca7c7e0 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -5,10 +5,10 @@ org.pentaho common-ui - 10.2.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT common-ui-impl - 10.2.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT pom Common-UI implementation diff --git a/impl/server/pom.xml b/impl/server/pom.xml index af037cb8b9..78c71467a9 100644 --- a/impl/server/pom.xml +++ b/impl/server/pom.xml @@ -6,31 +6,31 @@ org.pentaho common-ui-impl - 10.2.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT common-ui-impl-server - 10.2.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT Common UI server side Java portion of the Common UI codebase http://www.pentaho.com 4.13.2 - 10.2.0.0-SNAPSHOT - 10.2.0.0-SNAPSHOT - 10.2.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT 1 false 2.3.2 - 10.2.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT 5.10.0 - 10.2.0.0-SNAPSHOT - 10.2.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT 2.1 3.1.1 2.0.0 - 10.2.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT 2.2 - 10.2.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 0747c49ab0..77de1b8cb4 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ org.pentaho pentaho-ce-jar-parent-pom - 10.2.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT common-ui - 10.2.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT pom Common-UI root POM @@ -31,7 +31,7 @@ 1.9.2 1.0.9 - 10.2.0.0-SNAPSHOT + 10.3.0.0-SNAPSHOT 5.4.3 3.1.5 From 3d148d8a2bcc9854badf2e3ebed627ff33e1aeeb Mon Sep 17 00:00:00 2001 From: Bruno Cavaleiro Date: Tue, 2 Jul 2024 17:12:12 +0100 Subject: [PATCH 25/40] [PPP-4305] Upgrade boostsrap.js to 3.4.1 --- impl/client/pom.xml | 6 +- .../assembly/dependencies-js-assembly.xml | 12 +- .../javascript/web/bootstrap/bootstrap.js | 2275 ----------------- .../web/dojo/dijit/templates/TitlePane.html | 4 +- .../dojo/pentaho/common/CheckedMenuItem.html | 2 +- .../dojo/pentaho/common/ComboColorPicker.html | 4 +- .../web/dojo/pentaho/common/ListItem.html | 2 +- .../web/dojo/pentaho/common/MenuItem.html | 2 +- .../web/dojo/pentaho/common/MessageBox.html | 2 +- .../dojo/pentaho/common/SectionHeader.html | 4 +- .../web/dojo/pentaho/common/SplashScreen.html | 2 +- .../dojo/pentaho/common/datasourceselect.html | 4 +- .../datasourceselect/datasourceselect.html | 2 +- .../javascript/testSamples/style-samples.html | 68 +- .../javascript/testSamples/tabsettest.html | 8 +- 15 files changed, 61 insertions(+), 2336 deletions(-) delete mode 100644 impl/client/src/main/javascript/web/bootstrap/bootstrap.js diff --git a/impl/client/pom.xml b/impl/client/pom.xml index 476f1db9b8..42a245f97f 100644 --- a/impl/client/pom.xml +++ b/impl/client/pom.xml @@ -19,7 +19,7 @@ for each of the constituents (e.g. vizapi, prompting) of the current artifact. - dojo-release,prantlf__requirejs,jquery,jquery-i18n-properties,pentaho-cdf-js,angular,angular-animate,angular-i18n,uirouter__core,uirouter__angularjs,echarts,dompurify + dojo-release,prantlf__requirejs,jquery,jquery-i18n-properties,pentaho-cdf-js,angular,angular-animate,angular-i18n,uirouter__core,uirouter__angularjs,echarts,dompurify,bootstrap target/js-reports jsdoc-vizapi.json @@ -92,6 +92,10 @@ org.webjars.npm dompurify + + org.webjars.npm + bootstrap + diff --git a/impl/client/src/main/assembly/dependencies-js-assembly.xml b/impl/client/src/main/assembly/dependencies-js-assembly.xml index 226e2298a3..958b598234 100644 --- a/impl/client/src/main/assembly/dependencies-js-assembly.xml +++ b/impl/client/src/main/assembly/dependencies-js-assembly.xml @@ -143,14 +143,10 @@ jquery - - - - - - - - + + ${webjars.target.directory}/bootstrap/${bootstrap.version}/dist/js/bootstrap.js + bootstrap + diff --git a/impl/client/src/main/javascript/web/bootstrap/bootstrap.js b/impl/client/src/main/javascript/web/bootstrap/bootstrap.js deleted file mode 100644 index 33a87c0e60..0000000000 --- a/impl/client/src/main/javascript/web/bootstrap/bootstrap.js +++ /dev/null @@ -1,2275 +0,0 @@ -/*! =================================================== -* bootstrap-transition.js v2.3.1 -* http://twitter.github.com/bootstrap/javascript.html#transitions -* =================================================== -* Copyright 2012 Twitter, Inc. -* -* 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 -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* 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. -* ========================================================== */ - -!function ($) { - - "use strict"; // jshint ;_; - - - /* CSS TRANSITION SUPPORT (http://www.modernizr.com/) - * ======================================================= */ - - $(function () { - - $.support.transition = (function () { - - var transitionEnd = (function () { - - var el = document.createElement('bootstrap') - , transEndEventNames = { - 'WebkitTransition' : 'webkitTransitionEnd' - , 'MozTransition' : 'transitionend' - , 'OTransition' : 'oTransitionEnd otransitionend' - , 'transition' : 'transitionend' - } - , name - - for (name in transEndEventNames){ - if (el.style[name] !== undefined) { - return transEndEventNames[name] - } - } - - }()) - - return transitionEnd && { - end: transitionEnd - } - - })() - - }) - -}(window.jQuery);/* ========================================================== - * bootstrap-alert.js v2.3.1 - * http://twitter.github.com/bootstrap/javascript.html#alerts - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * 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. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* ALERT CLASS DEFINITION - * ====================== */ - - var dismiss = '[data-dismiss="alert"]' - , Alert = function (el) { - $(el).on('click', dismiss, this.close) - } - - Alert.prototype.close = function (e) { - var $this = $(this) - , selector = $this.attr('data-target') - , $parent - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - $parent = $(selector) - - e && e.preventDefault() - - $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) - - $parent.trigger(e = $.Event('close')) - - if (e.isDefaultPrevented()) return - - $parent.removeClass('in') - - function removeElement() { - $parent - .trigger('closed') - .remove() - } - - $.support.transition && $parent.hasClass('fade') ? - $parent.on($.support.transition.end, removeElement) : - removeElement() - } - - - /* ALERT PLUGIN DEFINITION - * ======================= */ - - var old = $.fn.alert - - $.fn.alert = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('alert') - if (!data) $this.data('alert', (data = new Alert(this))) - if (typeof option == 'string') data[option].call($this) - }) - } - - $.fn.alert.Constructor = Alert - - - /* ALERT NO CONFLICT - * ================= */ - - $.fn.alert.noConflict = function () { - $.fn.alert = old - return this - } - - - /* ALERT DATA-API - * ============== */ - - $(document).on('click.alert.data-api', dismiss, Alert.prototype.close) - -}(window.jQuery);/* ============================================================ - * bootstrap-button.js v2.3.1 - * http://twitter.github.com/bootstrap/javascript.html#buttons - * ============================================================ - * Copyright 2012 Twitter, Inc. - * - * 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * 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. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* BUTTON PUBLIC CLASS DEFINITION - * ============================== */ - - var Button = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.button.defaults, options) - } - - Button.prototype.setState = function (state) { - var d = 'disabled' - , $el = this.$element - , data = $el.data() - , val = $el.is('input') ? 'val' : 'html' - - state = state + 'Text' - data.resetText || $el.data('resetText', $el[val]()) - - $el[val](data[state] || this.options[state]) - - // push to event loop to allow forms to submit - setTimeout(function () { - state == 'loadingText' ? - $el.addClass(d).attr(d, d) : - $el.removeClass(d).removeAttr(d) - }, 0) - } - - Button.prototype.toggle = function () { - var $parent = this.$element.closest('[data-toggle="buttons-radio"]') - - $parent && $parent - .find('.active') - .removeClass('active') - - this.$element.toggleClass('active') - } - - - /* BUTTON PLUGIN DEFINITION - * ======================== */ - - var old = $.fn.button - - $.fn.button = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('button') - , options = typeof option == 'object' && option - if (!data) $this.data('button', (data = new Button(this, options))) - if (option == 'toggle') data.toggle() - else if (option) data.setState(option) - }) - } - - $.fn.button.defaults = { - loadingText: 'loading...' - } - - $.fn.button.Constructor = Button - - - /* BUTTON NO CONFLICT - * ================== */ - - $.fn.button.noConflict = function () { - $.fn.button = old - return this - } - - - /* BUTTON DATA-API - * =============== */ - - $(document).on('click.button.data-api', '[data-toggle^=button]', function (e) { - var $btn = $(e.target) - if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') - $btn.button('toggle') - }) - -}(window.jQuery);/* ========================================================== - * bootstrap-carousel.js v2.3.1 - * http://twitter.github.com/bootstrap/javascript.html#carousel - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * 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. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* CAROUSEL CLASS DEFINITION - * ========================= */ - - var Carousel = function (element, options) { - this.$element = $(element) - this.$indicators = this.$element.find('.carousel-indicators') - this.options = options - this.options.pause == 'hover' && this.$element - .on('mouseenter', $.proxy(this.pause, this)) - .on('mouseleave', $.proxy(this.cycle, this)) - } - - Carousel.prototype = { - - cycle: function (e) { - if (!e) this.paused = false - if (this.interval) clearInterval(this.interval); - this.options.interval - && !this.paused - && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) - return this - } - - , getActiveIndex: function () { - this.$active = this.$element.find('.item.active') - this.$items = this.$active.parent().children() - return this.$items.index(this.$active) - } - - , to: function (pos) { - var activeIndex = this.getActiveIndex() - , that = this - - if (pos > (this.$items.length - 1) || pos < 0) return - - if (this.sliding) { - return this.$element.one('slid', function () { - that.to(pos) - }) - } - - if (activeIndex == pos) { - return this.pause().cycle() - } - - return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos])) - } - - , pause: function (e) { - if (!e) this.paused = true - if (this.$element.find('.next, .prev').length && $.support.transition.end) { - this.$element.trigger($.support.transition.end) - this.cycle(true) - } - clearInterval(this.interval) - this.interval = null - return this - } - - , next: function () { - if (this.sliding) return - return this.slide('next') - } - - , prev: function () { - if (this.sliding) return - return this.slide('prev') - } - - , slide: function (type, next) { - var $active = this.$element.find('.item.active') - , $next = next || $active[type]() - , isCycling = this.interval - , direction = type == 'next' ? 'left' : 'right' - , fallback = type == 'next' ? 'first' : 'last' - , that = this - , e - - this.sliding = true - - isCycling && this.pause() - - $next = $next.length ? $next : this.$element.find('.item')[fallback]() - - e = $.Event('slide', { - relatedTarget: $next[0] - , direction: direction - }) - - if ($next.hasClass('active')) return - - if (this.$indicators.length) { - this.$indicators.find('.active').removeClass('active') - this.$element.one('slid', function () { - var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()]) - $nextIndicator && $nextIndicator.addClass('active') - }) - } - - if ($.support.transition && this.$element.hasClass('slide')) { - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - $next.addClass(type) - $next[0].offsetWidth // force reflow - $active.addClass(direction) - $next.addClass(direction) - this.$element.one($.support.transition.end, function () { - $next.removeClass([type, direction].join(' ')).addClass('active') - $active.removeClass(['active', direction].join(' ')) - that.sliding = false - setTimeout(function () { that.$element.trigger('slid') }, 0) - }) - } else { - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - $active.removeClass('active') - $next.addClass('active') - this.sliding = false - this.$element.trigger('slid') - } - - isCycling && this.cycle() - - return this - } - - } - - - /* CAROUSEL PLUGIN DEFINITION - * ========================== */ - - var old = $.fn.carousel - - $.fn.carousel = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('carousel') - , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option) - , action = typeof option == 'string' ? option : options.slide - if (!data) $this.data('carousel', (data = new Carousel(this, options))) - if (typeof option == 'number') data.to(option) - else if (action) data[action]() - else if (options.interval) data.pause().cycle() - }) - } - - $.fn.carousel.defaults = { - interval: 5000 - , pause: 'hover' - } - - $.fn.carousel.Constructor = Carousel - - - /* CAROUSEL NO CONFLICT - * ==================== */ - - $.fn.carousel.noConflict = function () { - $.fn.carousel = old - return this - } - - /* CAROUSEL DATA-API - * ================= */ - - $(document).on('click.carousel.data-api', '[data-slide], [data-slide-to]', function (e) { - var $this = $(this), href - , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - , options = $.extend({}, $target.data(), $this.data()) - , slideIndex - - $target.carousel(options) - - if (slideIndex = $this.attr('data-slide-to')) { - $target.data('carousel').pause().to(slideIndex).cycle() - } - - e.preventDefault() - }) - -}(window.jQuery);/* ============================================================= - * bootstrap-collapse.js v2.3.1 - * http://twitter.github.com/bootstrap/javascript.html#collapse - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * 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. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* COLLAPSE PUBLIC CLASS DEFINITION - * ================================ */ - - var Collapse = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.collapse.defaults, options) - - if (this.options.parent) { - this.$parent = $(this.options.parent) - } - - this.options.toggle && this.toggle() - } - - Collapse.prototype = { - - constructor: Collapse - - , dimension: function () { - var hasWidth = this.$element.hasClass('width') - return hasWidth ? 'width' : 'height' - } - - , show: function () { - var dimension - , scroll - , actives - , hasData - - if (this.transitioning || this.$element.hasClass('in')) return - - dimension = this.dimension() - scroll = $.camelCase(['scroll', dimension].join('-')) - actives = this.$parent && this.$parent.find('> .accordion-group > .in') - - if (actives && actives.length) { - hasData = actives.data('collapse') - if (hasData && hasData.transitioning) return - actives.collapse('hide') - hasData || actives.data('collapse', null) - } - - this.$element[dimension](0) - this.transition('addClass', $.Event('show'), 'shown') - $.support.transition && this.$element[dimension](this.$element[0][scroll]) - } - - , hide: function () { - var dimension - if (this.transitioning || !this.$element.hasClass('in')) return - dimension = this.dimension() - this.reset(this.$element[dimension]()) - this.transition('removeClass', $.Event('hide'), 'hidden') - this.$element[dimension](0) - } - - , reset: function (size) { - var dimension = this.dimension() - - this.$element - .removeClass('collapse') - [dimension](size || 'auto') - [0].offsetWidth - - this.$element[size !== null ? 'addClass' : 'removeClass']('collapse') - - return this - } - - , transition: function (method, startEvent, completeEvent) { - var that = this - , complete = function () { - if (startEvent.type == 'show') that.reset() - that.transitioning = 0 - that.$element.trigger(completeEvent) - } - - this.$element.trigger(startEvent) - - if (startEvent.isDefaultPrevented()) return - - this.transitioning = 1 - - this.$element[method]('in') - - $.support.transition && this.$element.hasClass('collapse') ? - this.$element.one($.support.transition.end, complete) : - complete() - } - - , toggle: function () { - this[this.$element.hasClass('in') ? 'hide' : 'show']() - } - - } - - - /* COLLAPSE PLUGIN DEFINITION - * ========================== */ - - var old = $.fn.collapse - - $.fn.collapse = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('collapse') - , options = $.extend({}, $.fn.collapse.defaults, $this.data(), typeof option == 'object' && option) - if (!data) $this.data('collapse', (data = new Collapse(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.collapse.defaults = { - toggle: true - } - - $.fn.collapse.Constructor = Collapse - - - /* COLLAPSE NO CONFLICT - * ==================== */ - - $.fn.collapse.noConflict = function () { - $.fn.collapse = old - return this - } - - - /* COLLAPSE DATA-API - * ================= */ - - $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) { - var $this = $(this), href - , target = $this.attr('data-target') - || e.preventDefault() - || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 - , option = $(target).data('collapse') ? 'toggle' : $this.data() - $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed') - $(target).collapse(option) - }) - -}(window.jQuery);/* ============================================================ - * bootstrap-dropdown.js v2.3.1 - * http://twitter.github.com/bootstrap/javascript.html#dropdowns - * ============================================================ - * Copyright 2012 Twitter, Inc. - * - * 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * 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. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* DROPDOWN CLASS DEFINITION - * ========================= */ - - var toggle = '[data-toggle=dropdown]' - , Dropdown = function (element) { - var $el = $(element).on('click.dropdown.data-api', this.toggle) - $('html').on('click.dropdown.data-api', function () { - $el.parent().removeClass('open') - }) - } - - Dropdown.prototype = { - - constructor: Dropdown - - , toggle: function (e) { - var $this = $(this) - , $parent - , isActive - - if ($this.is('.disabled, :disabled')) return - - $parent = getParent($this) - - isActive = $parent.hasClass('open') - - clearMenus() - - if (!isActive) { - $parent.toggleClass('open') - } - - $this.focus() - - return false - } - - , keydown: function (e) { - var $this - , $items - , $active - , $parent - , isActive - , index - - if (!/(38|40|27)/.test(e.keyCode)) return - - $this = $(this) - - e.preventDefault() - e.stopPropagation() - - if ($this.is('.disabled, :disabled')) return - - $parent = getParent($this) - - isActive = $parent.hasClass('open') - - if (!isActive || (isActive && e.keyCode == 27)) { - if (e.which == 27) $parent.find(toggle).focus() - return $this.click() - } - - $items = $('[role=menu] li:not(.divider):visible a', $parent) - - if (!$items.length) return - - index = $items.index($items.filter(':focus')) - - if (e.keyCode == 38 && index > 0) index-- // up - if (e.keyCode == 40 && index < $items.length - 1) index++ // down - if (!~index) index = 0 - - $items - .eq(index) - .focus() - } - - } - - function clearMenus() { - $(toggle).each(function () { - getParent($(this)).removeClass('open') - }) - } - - function getParent($this) { - var selector = $this.attr('data-target') - , $parent - - if (!selector) { - selector = $this.attr('href') - selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - $parent = selector && $(selector) - - if (!$parent || !$parent.length) $parent = $this.parent() - - return $parent - } - - - /* DROPDOWN PLUGIN DEFINITION - * ========================== */ - - var old = $.fn.dropdown - - $.fn.dropdown = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('dropdown') - if (!data) $this.data('dropdown', (data = new Dropdown(this))) - if (typeof option == 'string') data[option].call($this) - }) - } - - $.fn.dropdown.Constructor = Dropdown - - - /* DROPDOWN NO CONFLICT - * ==================== */ - - $.fn.dropdown.noConflict = function () { - $.fn.dropdown = old - return this - } - - - /* APPLY TO STANDARD DROPDOWN ELEMENTS - * =================================== */ - - $(document) - .on('click.dropdown.data-api', clearMenus) - .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) - .on('click.dropdown-menu', function (e) { e.stopPropagation() }) - .on('click.dropdown.data-api' , toggle, Dropdown.prototype.toggle) - .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) - -}(window.jQuery); -/* ========================================================= - * bootstrap-modal.js v2.3.1 - * http://twitter.github.com/bootstrap/javascript.html#modals - * ========================================================= - * Copyright 2012 Twitter, Inc. - * - * 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * 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. - * ========================================================= */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* MODAL CLASS DEFINITION - * ====================== */ - - var Modal = function (element, options) { - this.options = options - this.$element = $(element) - .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this)) - this.options.remote && this.$element.find('.modal-body').load(this.options.remote) - } - - Modal.prototype = { - - constructor: Modal - - , toggle: function () { - return this[!this.isShown ? 'show' : 'hide']() - } - - , show: function () { - var that = this - , e = $.Event('show') - - this.$element.trigger(e) - - if (this.isShown || e.isDefaultPrevented()) return - - this.isShown = true - - this.escape() - - this.backdrop(function () { - var transition = $.support.transition && that.$element.hasClass('fade') - - if (!that.$element.parent().length) { - that.$element.appendTo(document.body) //don't move modals dom position - } - - that.$element.show() - - if (transition) { - that.$element[0].offsetWidth // force reflow - } - - that.$element - .addClass('in') - .attr('aria-hidden', false) - - that.enforceFocus() - - transition ? - that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown') }) : - that.$element.focus().trigger('shown') - - }) - } - - , hide: function (e) { - e && e.preventDefault() - - var that = this - - e = $.Event('hide') - - this.$element.trigger(e) - - if (!this.isShown || e.isDefaultPrevented()) return - - this.isShown = false - - this.escape() - - $(document).off('focusin.modal') - - this.$element - .removeClass('in') - .attr('aria-hidden', true) - - $.support.transition && this.$element.hasClass('fade') ? - this.hideWithTransition() : - this.hideModal() - } - - , enforceFocus: function () { - var that = this - $(document).on('focusin.modal', function (e) { - if (that.$element[0] !== e.target && !that.$element.has(e.target).length) { - that.$element.focus() - } - }) - } - - , escape: function () { - var that = this - if (this.isShown && this.options.keyboard) { - this.$element.on('keyup.dismiss.modal', function ( e ) { - e.which == 27 && that.hide() - }) - } else if (!this.isShown) { - this.$element.off('keyup.dismiss.modal') - } - } - - , hideWithTransition: function () { - var that = this - , timeout = setTimeout(function () { - that.$element.off($.support.transition.end) - that.hideModal() - }, 500) - - this.$element.one($.support.transition.end, function () { - clearTimeout(timeout) - that.hideModal() - }) - } - - , hideModal: function () { - var that = this - this.$element.hide() - this.backdrop(function () { - that.removeBackdrop() - that.$element.trigger('hidden') - }) - } - - , removeBackdrop: function () { - this.$backdrop && this.$backdrop.remove() - this.$backdrop = null - } - - , backdrop: function (callback) { - var that = this - , animate = this.$element.hasClass('fade') ? 'fade' : '' - - if (this.isShown && this.options.backdrop) { - var doAnimate = $.support.transition && animate - - this.$backdrop = $('
') - .appendTo(document.body) - - this.$backdrop.click( - this.options.backdrop == 'static' ? - $.proxy(this.$element[0].focus, this.$element[0]) - : $.proxy(this.hide, this) - ) - - if (doAnimate) this.$backdrop[0].offsetWidth // force reflow - - this.$backdrop.addClass('in') - - if (!callback) return - - doAnimate ? - this.$backdrop.one($.support.transition.end, callback) : - callback() - - } else if (!this.isShown && this.$backdrop) { - this.$backdrop.removeClass('in') - - $.support.transition && this.$element.hasClass('fade')? - this.$backdrop.one($.support.transition.end, callback) : - callback() - - } else if (callback) { - callback() - } - } - } - - - /* MODAL PLUGIN DEFINITION - * ======================= */ - - var old = $.fn.modal - - $.fn.modal = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('modal') - , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option) - if (!data) $this.data('modal', (data = new Modal(this, options))) - if (typeof option == 'string') data[option]() - else if (options.show) data.show() - }) - } - - $.fn.modal.defaults = { - backdrop: true - , keyboard: true - , show: true - } - - $.fn.modal.Constructor = Modal - - - /* MODAL NO CONFLICT - * ================= */ - - $.fn.modal.noConflict = function () { - $.fn.modal = old - return this - } - - - /* MODAL DATA-API - * ============== */ - - $(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) { - var $this = $(this) - , href = $this.attr('href') - , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7 - , option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data()) - - e.preventDefault() - - $target - .modal(option) - .one('hide', function () { - $this.focus() - }) - }) - -}(window.jQuery); -/* =========================================================== - * bootstrap-tooltip.js v2.3.1 - * http://twitter.github.com/bootstrap/javascript.html#tooltips - * Inspired by the original jQuery.tipsy by Jason Frame - * =========================================================== - * Copyright 2012 Twitter, Inc. - * - * 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * 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. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* TOOLTIP PUBLIC CLASS DEFINITION - * =============================== */ - - var Tooltip = function (element, options) { - this.init('tooltip', element, options) - } - - Tooltip.prototype = { - - constructor: Tooltip - - , init: function (type, element, options) { - var eventIn - , eventOut - , triggers - , trigger - , i - - this.type = type - this.$element = $(element) - this.options = this.getOptions(options) - this.enabled = true - - triggers = this.options.trigger.split(' ') - - for (i = triggers.length; i--;) { - trigger = triggers[i] - if (trigger == 'click') { - this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this)) - } else if (trigger != 'manual') { - eventIn = trigger == 'hover' ? 'mouseenter' : 'focus' - eventOut = trigger == 'hover' ? 'mouseleave' : 'blur' - this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this)) - this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this)) - } - } - - this.options.selector ? - (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : - this.fixTitle() - } - - , getOptions: function (options) { - options = $.extend({}, $.fn[this.type].defaults, this.$element.data(), options) - - if (options.delay && typeof options.delay == 'number') { - options.delay = { - show: options.delay - , hide: options.delay - } - } - - return options - } - - , enter: function (e) { - var defaults = $.fn[this.type].defaults - , options = {} - , self - - this._options && $.each(this._options, function (key, value) { - if (defaults[key] != value) options[key] = value - }, this) - - self = $(e.currentTarget)[this.type](options).data(this.type) - - if (!self.options.delay || !self.options.delay.show) return self.show() - - clearTimeout(this.timeout) - self.hoverState = 'in' - this.timeout = setTimeout(function() { - if (self.hoverState == 'in') self.show() - }, self.options.delay.show) - } - - , leave: function (e) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) - - if (this.timeout) clearTimeout(this.timeout) - if (!self.options.delay || !self.options.delay.hide) return self.hide() - - self.hoverState = 'out' - this.timeout = setTimeout(function() { - if (self.hoverState == 'out') self.hide() - }, self.options.delay.hide) - } - - , show: function () { - var $tip - , pos - , actualWidth - , actualHeight - , placement - , tp - , e = $.Event('show') - - if (this.hasContent() && this.enabled) { - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - $tip = this.tip() - this.setContent() - - if (this.options.animation) { - $tip.addClass('fade') - } - - placement = typeof this.options.placement == 'function' ? - this.options.placement.call(this, $tip[0], this.$element[0]) : - this.options.placement - - $tip - .detach() - .css({ top: 0, left: 0, display: 'block' }) - - this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element) - - pos = this.getPosition() - - actualWidth = $tip[0].offsetWidth - actualHeight = $tip[0].offsetHeight - - switch (placement) { - case 'bottom': - tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'top': - tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'left': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth} - break - case 'right': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width} - break - } - - this.applyPlacement(tp, placement) - this.$element.trigger('shown') - } - } - - , applyPlacement: function(offset, placement){ - var $tip = this.tip() - , width = $tip[0].offsetWidth - , height = $tip[0].offsetHeight - , actualWidth - , actualHeight - , delta - , replace - - $tip - .offset(offset) - .addClass(placement) - .addClass('in') - - actualWidth = $tip[0].offsetWidth - actualHeight = $tip[0].offsetHeight - - if (placement == 'top' && actualHeight != height) { - offset.top = offset.top + height - actualHeight - replace = true - } - - if (placement == 'bottom' || placement == 'top') { - delta = 0 - - if (offset.left < 0){ - delta = offset.left * -2 - offset.left = 0 - $tip.offset(offset) - actualWidth = $tip[0].offsetWidth - actualHeight = $tip[0].offsetHeight - } - - this.replaceArrow(delta - width + actualWidth, actualWidth, 'left') - } else { - this.replaceArrow(actualHeight - height, actualHeight, 'top') - } - - if (replace) $tip.offset(offset) - } - - , replaceArrow: function(delta, dimension, position){ - this - .arrow() - .css(position, delta ? (50 * (1 - delta / dimension) + "%") : '') - } - - , setContent: function () { - var $tip = this.tip() - , title = this.getTitle() - - $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title) - $tip.removeClass('fade in top bottom left right') - } - - , hide: function () { - var that = this - , $tip = this.tip() - , e = $.Event('hide') - - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - - $tip.removeClass('in') - - function removeWithAnimation() { - var timeout = setTimeout(function () { - $tip.off($.support.transition.end).detach() - }, 500) - - $tip.one($.support.transition.end, function () { - clearTimeout(timeout) - $tip.detach() - }) - } - - $.support.transition && this.$tip.hasClass('fade') ? - removeWithAnimation() : - $tip.detach() - - this.$element.trigger('hidden') - - return this - } - - , fixTitle: function () { - var $e = this.$element - if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { - $e.attr('data-original-title', $e.attr('title') || '').attr('title', '') - } - } - - , hasContent: function () { - return this.getTitle() - } - - , getPosition: function () { - var el = this.$element[0] - return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : { - width: el.offsetWidth - , height: el.offsetHeight - }, this.$element.offset()) - } - - , getTitle: function () { - var title - , $e = this.$element - , o = this.options - - title = $e.attr('data-original-title') - || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) - - return title - } - - , tip: function () { - return this.$tip = this.$tip || $(this.options.template) - } - - , arrow: function(){ - return this.$arrow = this.$arrow || this.tip().find(".tooltip-arrow") - } - - , validate: function () { - if (!this.$element[0].parentNode) { - this.hide() - this.$element = null - this.options = null - } - } - - , enable: function () { - this.enabled = true - } - - , disable: function () { - this.enabled = false - } - - , toggleEnabled: function () { - this.enabled = !this.enabled - } - - , toggle: function (e) { - var self = e ? $(e.currentTarget)[this.type](this._options).data(this.type) : this - self.tip().hasClass('in') ? self.hide() : self.show() - } - - , destroy: function () { - this.hide().$element.off('.' + this.type).removeData(this.type) - } - - } - - - /* TOOLTIP PLUGIN DEFINITION - * ========================= */ - - var old = $.fn.tooltip - - $.fn.tooltip = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('tooltip') - , options = typeof option == 'object' && option - if (!data) $this.data('tooltip', (data = new Tooltip(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.tooltip.Constructor = Tooltip - - $.fn.tooltip.defaults = { - animation: true - , placement: 'top' - , selector: false - , template: '
' - , trigger: 'hover focus' - , title: '' - , delay: 0 - , html: false - , container: false - } - - - /* TOOLTIP NO CONFLICT - * =================== */ - - $.fn.tooltip.noConflict = function () { - $.fn.tooltip = old - return this - } - -}(window.jQuery); -/* =========================================================== - * bootstrap-popover.js v2.3.1 - * http://twitter.github.com/bootstrap/javascript.html#popovers - * =========================================================== - * Copyright 2012 Twitter, Inc. - * - * 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * 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. - * =========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* POPOVER PUBLIC CLASS DEFINITION - * =============================== */ - - var Popover = function (element, options) { - this.init('popover', element, options) - } - - - /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js - ========================================== */ - - Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, { - - constructor: Popover - - , setContent: function () { - var $tip = this.tip() - , title = this.getTitle() - , content = this.getContent() - - $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) - $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content) - - $tip.removeClass('fade top bottom left right in') - } - - , hasContent: function () { - return this.getTitle() || this.getContent() - } - - , getContent: function () { - var content - , $e = this.$element - , o = this.options - - content = (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) - || $e.attr('data-content') - - return content - } - - , tip: function () { - if (!this.$tip) { - this.$tip = $(this.options.template) - } - return this.$tip - } - - , destroy: function () { - this.hide().$element.off('.' + this.type).removeData(this.type) - } - - }) - - - /* POPOVER PLUGIN DEFINITION - * ======================= */ - - var old = $.fn.popover - - $.fn.popover = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('popover') - , options = typeof option == 'object' && option - if (!data) $this.data('popover', (data = new Popover(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.popover.Constructor = Popover - - $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, { - placement: 'right' - , trigger: 'click' - , content: '' - , template: '

' - }) - - - /* POPOVER NO CONFLICT - * =================== */ - - $.fn.popover.noConflict = function () { - $.fn.popover = old - return this - } - -}(window.jQuery); -/* ============================================================= - * bootstrap-scrollspy.js v2.3.1 - * http://twitter.github.com/bootstrap/javascript.html#scrollspy - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * 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. - * ============================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* SCROLLSPY CLASS DEFINITION - * ========================== */ - - function ScrollSpy(element, options) { - var process = $.proxy(this.process, this) - , $element = $(element).is('body') ? $(window) : $(element) - , href - this.options = $.extend({}, $.fn.scrollspy.defaults, options) - this.$scrollElement = $element.on('scroll.scroll-spy.data-api', process) - this.selector = (this.options.target - || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - || '') + ' .nav li > a' - this.$body = $('body') - this.refresh() - this.process() - } - - ScrollSpy.prototype = { - - constructor: ScrollSpy - - , refresh: function () { - var self = this - , $targets - - this.offsets = $([]) - this.targets = $([]) - - $targets = this.$body - .find(this.selector) - .map(function () { - var $el = $(this) - , href = $el.data('target') || $el.attr('href') - , $href = /^#\w/.test(href) && $(href) - return ( $href - && $href.length - && [[ $href.position().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]] ) || null - }) - .sort(function (a, b) { return a[0] - b[0] }) - .each(function () { - self.offsets.push(this[0]) - self.targets.push(this[1]) - }) - } - - , process: function () { - var scrollTop = this.$scrollElement.scrollTop() + this.options.offset - , scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight - , maxScroll = scrollHeight - this.$scrollElement.height() - , offsets = this.offsets - , targets = this.targets - , activeTarget = this.activeTarget - , i - - if (scrollTop >= maxScroll) { - return activeTarget != (i = targets.last()[0]) - && this.activate ( i ) - } - - for (i = offsets.length; i--;) { - activeTarget != targets[i] - && scrollTop >= offsets[i] - && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) - && this.activate( targets[i] ) - } - } - - , activate: function (target) { - var active - , selector - - this.activeTarget = target - - $(this.selector) - .parent('.active') - .removeClass('active') - - selector = this.selector - + '[data-target="' + target + '"],' - + this.selector + '[href="' + target + '"]' - - active = $(selector) - .parent('li') - .addClass('active') - - if (active.parent('.dropdown-menu').length) { - active = active.closest('li.dropdown').addClass('active') - } - - active.trigger('activate') - } - - } - - - /* SCROLLSPY PLUGIN DEFINITION - * =========================== */ - - var old = $.fn.scrollspy - - $.fn.scrollspy = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('scrollspy') - , options = typeof option == 'object' && option - if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.scrollspy.Constructor = ScrollSpy - - $.fn.scrollspy.defaults = { - offset: 10 - } - - - /* SCROLLSPY NO CONFLICT - * ===================== */ - - $.fn.scrollspy.noConflict = function () { - $.fn.scrollspy = old - return this - } - - - /* SCROLLSPY DATA-API - * ================== */ - - $(window).on('load', function () { - $('[data-spy="scroll"]').each(function () { - var $spy = $(this) - $spy.scrollspy($spy.data()) - }) - }) - -}(window.jQuery);/* ======================================================== - * bootstrap-tab.js v2.3.1 - * http://twitter.github.com/bootstrap/javascript.html#tabs - * ======================================================== - * Copyright 2012 Twitter, Inc. - * - * 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * 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. - * ======================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* TAB CLASS DEFINITION - * ==================== */ - - var Tab = function (element) { - this.element = $(element) - } - - Tab.prototype = { - - constructor: Tab - - , show: function () { - var $this = this.element - , $ul = $this.closest('ul:not(.dropdown-menu)') - , selector = $this.attr('data-target') - , previous - , $target - , e - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - if ( $this.parent('li').hasClass('active') ) return - - previous = $ul.find('.active:last a')[0] - - e = $.Event('show', { - relatedTarget: previous - }) - - $this.trigger(e) - - if (e.isDefaultPrevented()) return - - $target = $(selector) - - this.activate($this.parent('li'), $ul) - this.activate($target, $target.parent(), function () { - $this.trigger({ - type: 'shown' - , relatedTarget: previous - }) - }) - } - - , activate: function ( element, container, callback) { - var $active = container.find('> .active') - , transition = callback - && $.support.transition - && $active.hasClass('fade') - - function next() { - $active - .removeClass('active') - .find('> .dropdown-menu > .active') - .removeClass('active') - - element.addClass('active') - - if (transition) { - element[0].offsetWidth // reflow for transition - element.addClass('in') - } else { - element.removeClass('fade') - } - - if ( element.parent('.dropdown-menu') ) { - element.closest('li.dropdown').addClass('active') - } - - callback && callback() - } - - transition ? - $active.one($.support.transition.end, next) : - next() - - $active.removeClass('in') - } - } - - - /* TAB PLUGIN DEFINITION - * ===================== */ - - var old = $.fn.tab - - $.fn.tab = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('tab') - if (!data) $this.data('tab', (data = new Tab(this))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.tab.Constructor = Tab - - - /* TAB NO CONFLICT - * =============== */ - - $.fn.tab.noConflict = function () { - $.fn.tab = old - return this - } - - - /* TAB DATA-API - * ============ */ - - $(document).on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { - e.preventDefault() - $(this).tab('show') - }) - -}(window.jQuery);/* ============================================================= - * bootstrap-typeahead.js v2.3.1 - * http://twitter.github.com/bootstrap/javascript.html#typeahead - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * 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. - * ============================================================ */ - - -!function($){ - - "use strict"; // jshint ;_; - - - /* TYPEAHEAD PUBLIC CLASS DEFINITION - * ================================= */ - - var Typeahead = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.typeahead.defaults, options) - this.matcher = this.options.matcher || this.matcher - this.sorter = this.options.sorter || this.sorter - this.highlighter = this.options.highlighter || this.highlighter - this.updater = this.options.updater || this.updater - this.source = this.options.source - this.$menu = $(this.options.menu) - this.shown = false - this.listen() - } - - Typeahead.prototype = { - - constructor: Typeahead - - , select: function () { - var val = this.$menu.find('.active').attr('data-value') - this.$element - .val(this.updater(val)) - .change() - return this.hide() - } - - , updater: function (item) { - return item - } - - , show: function () { - var pos = $.extend({}, this.$element.position(), { - height: this.$element[0].offsetHeight - }) - - this.$menu - .insertAfter(this.$element) - .css({ - top: pos.top + pos.height - , left: pos.left - }) - .show() - - this.shown = true - return this - } - - , hide: function () { - this.$menu.hide() - this.shown = false - return this - } - - , lookup: function (event) { - var items - - this.query = this.$element.val() - - if (!this.query || this.query.length < this.options.minLength) { - return this.shown ? this.hide() : this - } - - items = $.isFunction(this.source) ? this.source(this.query, $.proxy(this.process, this)) : this.source - - return items ? this.process(items) : this - } - - , process: function (items) { - var that = this - - items = $.grep(items, function (item) { - return that.matcher(item) - }) - - items = this.sorter(items) - - if (!items.length) { - return this.shown ? this.hide() : this - } - - return this.render(items.slice(0, this.options.items)).show() - } - - , matcher: function (item) { - return ~item.toLowerCase().indexOf(this.query.toLowerCase()) - } - - , sorter: function (items) { - var beginswith = [] - , caseSensitive = [] - , caseInsensitive = [] - , item - - while (item = items.shift()) { - if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item) - else if (~item.indexOf(this.query)) caseSensitive.push(item) - else caseInsensitive.push(item) - } - - return beginswith.concat(caseSensitive, caseInsensitive) - } - - , highlighter: function (item) { - var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&') - return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) { - return '' + match + '' - }) - } - - , render: function (items) { - var that = this - - items = $(items).map(function (i, item) { - i = $(that.options.item).attr('data-value', item) - i.find('a').html(that.highlighter(item)) - return i[0] - }) - - items.first().addClass('active') - this.$menu.html(items) - return this - } - - , next: function (event) { - var active = this.$menu.find('.active').removeClass('active') - , next = active.next() - - if (!next.length) { - next = $(this.$menu.find('li')[0]) - } - - next.addClass('active') - } - - , prev: function (event) { - var active = this.$menu.find('.active').removeClass('active') - , prev = active.prev() - - if (!prev.length) { - prev = this.$menu.find('li').last() - } - - prev.addClass('active') - } - - , listen: function () { - this.$element - .on('focus', $.proxy(this.focus, this)) - .on('blur', $.proxy(this.blur, this)) - .on('keypress', $.proxy(this.keypress, this)) - .on('keyup', $.proxy(this.keyup, this)) - - if (this.eventSupported('keydown')) { - this.$element.on('keydown', $.proxy(this.keydown, this)) - } - - this.$menu - .on('click', $.proxy(this.click, this)) - .on('mouseenter', 'li', $.proxy(this.mouseenter, this)) - .on('mouseleave', 'li', $.proxy(this.mouseleave, this)) - } - - , eventSupported: function(eventName) { - var isSupported = eventName in this.$element - if (!isSupported) { - this.$element.setAttribute(eventName, 'return;') - isSupported = typeof this.$element[eventName] === 'function' - } - return isSupported - } - - , move: function (e) { - if (!this.shown) return - - switch(e.keyCode) { - case 9: // tab - case 13: // enter - case 27: // escape - e.preventDefault() - break - - case 38: // up arrow - e.preventDefault() - this.prev() - break - - case 40: // down arrow - e.preventDefault() - this.next() - break - } - - e.stopPropagation() - } - - , keydown: function (e) { - this.suppressKeyPressRepeat = ~$.inArray(e.keyCode, [40,38,9,13,27]) - this.move(e) - } - - , keypress: function (e) { - if (this.suppressKeyPressRepeat) return - this.move(e) - } - - , keyup: function (e) { - switch(e.keyCode) { - case 40: // down arrow - case 38: // up arrow - case 16: // shift - case 17: // ctrl - case 18: // alt - break - - case 9: // tab - case 13: // enter - if (!this.shown) return - this.select() - break - - case 27: // escape - if (!this.shown) return - this.hide() - break - - default: - this.lookup() - } - - e.stopPropagation() - e.preventDefault() - } - - , focus: function (e) { - this.focused = true - } - - , blur: function (e) { - this.focused = false - if (!this.mousedover && this.shown) this.hide() - } - - , click: function (e) { - e.stopPropagation() - e.preventDefault() - this.select() - this.$element.focus() - } - - , mouseenter: function (e) { - this.mousedover = true - this.$menu.find('.active').removeClass('active') - $(e.currentTarget).addClass('active') - } - - , mouseleave: function (e) { - this.mousedover = false - if (!this.focused && this.shown) this.hide() - } - - } - - - /* TYPEAHEAD PLUGIN DEFINITION - * =========================== */ - - var old = $.fn.typeahead - - $.fn.typeahead = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('typeahead') - , options = typeof option == 'object' && option - if (!data) $this.data('typeahead', (data = new Typeahead(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.typeahead.defaults = { - source: [] - , items: 8 - , menu: '
    ' - , item: '
    • ' - , minLength: 1 - } - - $.fn.typeahead.Constructor = Typeahead - - - /* TYPEAHEAD NO CONFLICT - * =================== */ - - $.fn.typeahead.noConflict = function () { - $.fn.typeahead = old - return this - } - - - /* TYPEAHEAD DATA-API - * ================== */ - - $(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) { - var $this = $(this) - if ($this.data('typeahead')) return - $this.typeahead($this.data()) - }) - -}(window.jQuery); -/* ========================================================== - * bootstrap-affix.js v2.3.1 - * http://twitter.github.com/bootstrap/javascript.html#affix - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * 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. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* AFFIX CLASS DEFINITION - * ====================== */ - - var Affix = function (element, options) { - this.options = $.extend({}, $.fn.affix.defaults, options) - this.$window = $(window) - .on('scroll.affix.data-api', $.proxy(this.checkPosition, this)) - .on('click.affix.data-api', $.proxy(function () { setTimeout($.proxy(this.checkPosition, this), 1) }, this)) - this.$element = $(element) - this.checkPosition() - } - - Affix.prototype.checkPosition = function () { - if (!this.$element.is(':visible')) return - - var scrollHeight = $(document).height() - , scrollTop = this.$window.scrollTop() - , position = this.$element.offset() - , offset = this.options.offset - , offsetBottom = offset.bottom - , offsetTop = offset.top - , reset = 'affix affix-top affix-bottom' - , affix - - if (typeof offset != 'object') offsetBottom = offsetTop = offset - if (typeof offsetTop == 'function') offsetTop = offset.top() - if (typeof offsetBottom == 'function') offsetBottom = offset.bottom() - - affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ? - false : offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? - 'bottom' : offsetTop != null && scrollTop <= offsetTop ? - 'top' : false - - if (this.affixed === affix) return - - this.affixed = affix - this.unpin = affix == 'bottom' ? position.top - scrollTop : null - - this.$element.removeClass(reset).addClass('affix' + (affix ? '-' + affix : '')) - } - - - /* AFFIX PLUGIN DEFINITION - * ======================= */ - - var old = $.fn.affix - - $.fn.affix = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('affix') - , options = typeof option == 'object' && option - if (!data) $this.data('affix', (data = new Affix(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.affix.Constructor = Affix - - $.fn.affix.defaults = { - offset: 0 - } - - - /* AFFIX NO CONFLICT - * ================= */ - - $.fn.affix.noConflict = function () { - $.fn.affix = old - return this - } - - - /* AFFIX DATA-API - * ============== */ - - $(window).on('load', function () { - $('[data-spy="affix"]').each(function () { - var $spy = $(this) - , data = $spy.data() - - data.offset = data.offset || {} - - data.offsetBottom && (data.offset.bottom = data.offsetBottom) - data.offsetTop && (data.offset.top = data.offsetTop) - - $spy.affix(data) - }) - }) - - -}(window.jQuery); diff --git a/impl/client/src/main/javascript/web/dojo/dijit/templates/TitlePane.html b/impl/client/src/main/javascript/web/dojo/dijit/templates/TitlePane.html index ab367978f8..6c9dea1eb3 100644 --- a/impl/client/src/main/javascript/web/dojo/dijit/templates/TitlePane.html +++ b/impl/client/src/main/javascript/web/dojo/dijit/templates/TitlePane.html @@ -1,8 +1,8 @@
    + class="pentaho-titled-toolprogress-bar section-header-inner pentaho-padding-sm" data-dojo-attach-point="titleBarNode" id="${id}_titleBarNode">
    -
    diff --git a/impl/client/src/main/javascript/web/dojo/pentaho/common/CheckedMenuItem.html b/impl/client/src/main/javascript/web/dojo/pentaho/common/CheckedMenuItem.html index b7f93a19d8..a8dbbf94d9 100644 --- a/impl/client/src/main/javascript/web/dojo/pentaho/common/CheckedMenuItem.html +++ b/impl/client/src/main/javascript/web/dojo/pentaho/common/CheckedMenuItem.html @@ -3,7 +3,7 @@ ${checkedChar} - +   diff --git a/impl/client/src/main/javascript/web/dojo/pentaho/common/ComboColorPicker.html b/impl/client/src/main/javascript/web/dojo/pentaho/common/ComboColorPicker.html index 72d87e59b3..b9de730f54 100644 --- a/impl/client/src/main/javascript/web/dojo/pentaho/common/ComboColorPicker.html +++ b/impl/client/src/main/javascript/web/dojo/pentaho/common/ComboColorPicker.html @@ -11,7 +11,7 @@
    - -
    + Current @@ -46,7 +46,7 @@ diff --git a/impl/client/src/main/javascript/web/dojo/pentaho/common/ListItem.html b/impl/client/src/main/javascript/web/dojo/pentaho/common/ListItem.html index b889baa5a2..c2214ba7d8 100644 --- a/impl/client/src/main/javascript/web/dojo/pentaho/common/ListItem.html +++ b/impl/client/src/main/javascript/web/dojo/pentaho/common/ListItem.html @@ -2,7 +2,7 @@ - + - + diff --git a/impl/client/src/main/javascript/web/dojo/pentaho/common/SectionHeader.html b/impl/client/src/main/javascript/web/dojo/pentaho/common/SectionHeader.html index c273eee717..f8a9d93d13 100644 --- a/impl/client/src/main/javascript/web/dojo/pentaho/common/SectionHeader.html +++ b/impl/client/src/main/javascript/web/dojo/pentaho/common/SectionHeader.html @@ -1,10 +1,10 @@
    -
    +
    - In Use + In Use
    -
    +
    - ${header} + ${header}
    diff --git a/impl/client/src/main/javascript/web/dojo/pentaho/common/SplashScreen.html b/impl/client/src/main/javascript/web/dojo/pentaho/common/SplashScreen.html index 04730751a8..9bbfa6070d 100644 --- a/impl/client/src/main/javascript/web/dojo/pentaho/common/SplashScreen.html +++ b/impl/client/src/main/javascript/web/dojo/pentaho/common/SplashScreen.html @@ -10,7 +10,7 @@
    +
    diff --git a/impl/client/src/main/javascript/web/dojo/pentaho/common/datasourceselect.html b/impl/client/src/main/javascript/web/dojo/pentaho/common/datasourceselect.html index 10413131a5..95657add15 100644 --- a/impl/client/src/main/javascript/web/dojo/pentaho/common/datasourceselect.html +++ b/impl/client/src/main/javascript/web/dojo/pentaho/common/datasourceselect.html @@ -2,7 +2,7 @@ @@ -11,7 +11,7 @@
    - +
    @@ -112,7 +112,7 @@

    UI Styles

    @@ -529,7 +529,7 @@

    UI Styles

    - Data Sources: + Data Sources:
    - Data Sources: + Data Sources: diff --git a/impl/client/src/test/javascript/testSamples/style-samples.html b/impl/client/src/test/javascript/testSamples/style-samples.html index 97a9b58d30..127c3e3a51 100644 --- a/impl/client/src/test/javascript/testSamples/style-samples.html +++ b/impl/client/src/test/javascript/testSamples/style-samples.html @@ -86,7 +86,7 @@

    UI Styles
    - The dialog contents go here. Clicking 'Ok' or 'Cancel' will make the glass pane go away. + The dialog contents go here. Clicking 'Ok' or 'Cancel' will make the glass pane go away.
    - Click the button to show the glasspane + Click the button to show the glasspane -
    +
    @@ -543,7 +543,7 @@

    UI Styles

    - +
    @@ -558,8 +558,8 @@

    UI Styles

    		 -
    - +
    @@ -577,8 +577,8 @@

    UI Styles

    -
    - +
    @@ -596,13 +596,13 @@

    UI Styles

    -
    - +
    +
    @@ -613,8 +613,8 @@

    UI Styles

    - + diff --git a/impl/client/src/main/javascript/web/dojo/pentaho/common/ComboColorPicker.html b/impl/client/src/main/javascript/web/dojo/pentaho/common/ComboColorPicker.html index b9de730f54..72d87e59b3 100644 --- a/impl/client/src/main/javascript/web/dojo/pentaho/common/ComboColorPicker.html +++ b/impl/client/src/main/javascript/web/dojo/pentaho/common/ComboColorPicker.html @@ -11,7 +11,7 @@
    - +
    -
    - +
    @@ -633,8 +633,8 @@

    UI Styles

    diff --git a/impl/client/src/test/javascript/testSamples/tabsettest.html b/impl/client/src/test/javascript/testSamples/tabsettest.html index db8765e791..0c7b744045 100644 --- a/impl/client/src/test/javascript/testSamples/tabsettest.html +++ b/impl/client/src/test/javascript/testSamples/tabsettest.html @@ -98,11 +98,11 @@

    UI Widgets - Tab Set

    -
    +
    -
    - +
    @@ -666,7 +666,7 @@

    UI Styles

    @@ -732,11 +732,11 @@

    UI Styles

    -
    +
    - This is a label + This is a label
    - Section 1 + Section 1
    @@ -751,11 +751,11 @@

    UI Styles

    -
    +
    - + - + @@ -868,7 +868,7 @@

    UI Styles

    - +
    - Section 2 + Section 2
    @@ -773,11 +773,11 @@

    UI Styles

    -
    +
    @@ -816,7 +816,7 @@

    UI Styles

    onmouseover="if(this.className.indexOf('selected') == -1) {this.className='pentaho-listitem pentaho-listitem-hover'}" onmouseout="if(this.className.indexOf('selected') == -1) {this.className='pentaho-listitem'} else {this.className='pentaho-listitem-selected'}" onclick="enabledListManagementButtons(); this.className='pentaho-listitem-selected'"> - Option 2 + Option 2
    - Section 3 + Section 3 @@ -808,7 +808,7 @@

    UI Styles

    onmouseover="if(this.className.indexOf('selected') == -1) {this.className='pentaho-listitem pentaho-listitem-hover'}" onmouseout="if(this.className.indexOf('selected') == -1) {this.className='pentaho-listitem'} else {this.className='pentaho-listitem-selected'}" onclick="enabledListManagementButtons(); this.className='pentaho-listitem-selected'"> - Option 1 + Option 1
    @@ -849,14 +849,14 @@

    UI Styles

    		 Option 1Option 1  
    DisabledDisabled  
    CheckedChecked
    @@ -881,7 +881,7 @@

    UI Styles

    - Tooltip contents + Tooltip contents
    @@ -898,24 +898,24 @@

    UI Styles
    -
    Column 1
    +
    Column 1
    		 -
    Column 2
    +
    Column 2
    		 -
    Column 3
    +
    Column 3
    -
    Data
    +
    Data
    		 -
    Data
    +
    Data
    		 -
    Data
    +
    Data
    - Section 1 + Section 1
    @@ -114,11 +114,11 @@

    UI Widgets - Tab Set

    -
    +
    - Section 2 + Section 2
    From be4baf2dd70057d0e3e6dd0a4de103e476d2dcd9 Mon Sep 17 00:00:00 2001 From: Bruno Cavaleiro Date: Tue, 23 Jul 2024 14:57:59 +0100 Subject: [PATCH 26/40] Revert "[PPP-4305] Upgrade boostsrap.js to 3.4.1" This reverts commit 3d148d8a2bcc9854badf2e3ebed627ff33e1aeeb. --- impl/client/pom.xml | 6 +- .../assembly/dependencies-js-assembly.xml | 12 +- .../javascript/web/bootstrap/bootstrap.js | 2275 +++++++++++++++++ .../web/dojo/dijit/templates/TitlePane.html | 4 +- .../dojo/pentaho/common/CheckedMenuItem.html | 2 +- .../dojo/pentaho/common/ComboColorPicker.html | 4 +- .../web/dojo/pentaho/common/ListItem.html | 2 +- .../web/dojo/pentaho/common/MenuItem.html | 2 +- .../web/dojo/pentaho/common/MessageBox.html | 2 +- .../dojo/pentaho/common/SectionHeader.html | 4 +- .../web/dojo/pentaho/common/SplashScreen.html | 2 +- .../dojo/pentaho/common/datasourceselect.html | 4 +- .../datasourceselect/datasourceselect.html | 2 +- .../javascript/testSamples/style-samples.html | 68 +- .../javascript/testSamples/tabsettest.html | 8 +- 15 files changed, 2336 insertions(+), 61 deletions(-) create mode 100644 impl/client/src/main/javascript/web/bootstrap/bootstrap.js diff --git a/impl/client/pom.xml b/impl/client/pom.xml index 42a245f97f..476f1db9b8 100644 --- a/impl/client/pom.xml +++ b/impl/client/pom.xml @@ -19,7 +19,7 @@ for each of the constituents (e.g. vizapi, prompting) of the current artifact. - dojo-release,prantlf__requirejs,jquery,jquery-i18n-properties,pentaho-cdf-js,angular,angular-animate,angular-i18n,uirouter__core,uirouter__angularjs,echarts,dompurify,bootstrap + dojo-release,prantlf__requirejs,jquery,jquery-i18n-properties,pentaho-cdf-js,angular,angular-animate,angular-i18n,uirouter__core,uirouter__angularjs,echarts,dompurify target/js-reports jsdoc-vizapi.json @@ -92,10 +92,6 @@ org.webjars.npm dompurify - - org.webjars.npm - bootstrap - diff --git a/impl/client/src/main/assembly/dependencies-js-assembly.xml b/impl/client/src/main/assembly/dependencies-js-assembly.xml index 958b598234..226e2298a3 100644 --- a/impl/client/src/main/assembly/dependencies-js-assembly.xml +++ b/impl/client/src/main/assembly/dependencies-js-assembly.xml @@ -143,10 +143,14 @@ jquery - - ${webjars.target.directory}/bootstrap/${bootstrap.version}/dist/js/bootstrap.js - bootstrap - + + + + + + + + diff --git a/impl/client/src/main/javascript/web/bootstrap/bootstrap.js b/impl/client/src/main/javascript/web/bootstrap/bootstrap.js new file mode 100644 index 0000000000..33a87c0e60 --- /dev/null +++ b/impl/client/src/main/javascript/web/bootstrap/bootstrap.js @@ -0,0 +1,2275 @@ +/*! =================================================== +* bootstrap-transition.js v2.3.1 +* http://twitter.github.com/bootstrap/javascript.html#transitions +* =================================================== +* Copyright 2012 Twitter, Inc. +* +* 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 +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* 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. +* ========================================================== */ + +!function ($) { + + "use strict"; // jshint ;_; + + + /* CSS TRANSITION SUPPORT (http://www.modernizr.com/) + * ======================================================= */ + + $(function () { + + $.support.transition = (function () { + + var transitionEnd = (function () { + + var el = document.createElement('bootstrap') + , transEndEventNames = { + 'WebkitTransition' : 'webkitTransitionEnd' + , 'MozTransition' : 'transitionend' + , 'OTransition' : 'oTransitionEnd otransitionend' + , 'transition' : 'transitionend' + } + , name + + for (name in transEndEventNames){ + if (el.style[name] !== undefined) { + return transEndEventNames[name] + } + } + + }()) + + return transitionEnd && { + end: transitionEnd + } + + })() + + }) + +}(window.jQuery);/* ========================================================== + * bootstrap-alert.js v2.3.1 + * http://twitter.github.com/bootstrap/javascript.html#alerts + * ========================================================== + * Copyright 2012 Twitter, Inc. + * + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + * ========================================================== */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* ALERT CLASS DEFINITION + * ====================== */ + + var dismiss = '[data-dismiss="alert"]' + , Alert = function (el) { + $(el).on('click', dismiss, this.close) + } + + Alert.prototype.close = function (e) { + var $this = $(this) + , selector = $this.attr('data-target') + , $parent + + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } + + $parent = $(selector) + + e && e.preventDefault() + + $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) + + $parent.trigger(e = $.Event('close')) + + if (e.isDefaultPrevented()) return + + $parent.removeClass('in') + + function removeElement() { + $parent + .trigger('closed') + .remove() + } + + $.support.transition && $parent.hasClass('fade') ? + $parent.on($.support.transition.end, removeElement) : + removeElement() + } + + + /* ALERT PLUGIN DEFINITION + * ======================= */ + + var old = $.fn.alert + + $.fn.alert = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('alert') + if (!data) $this.data('alert', (data = new Alert(this))) + if (typeof option == 'string') data[option].call($this) + }) + } + + $.fn.alert.Constructor = Alert + + + /* ALERT NO CONFLICT + * ================= */ + + $.fn.alert.noConflict = function () { + $.fn.alert = old + return this + } + + + /* ALERT DATA-API + * ============== */ + + $(document).on('click.alert.data-api', dismiss, Alert.prototype.close) + +}(window.jQuery);/* ============================================================ + * bootstrap-button.js v2.3.1 + * http://twitter.github.com/bootstrap/javascript.html#buttons + * ============================================================ + * Copyright 2012 Twitter, Inc. + * + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + * ============================================================ */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* BUTTON PUBLIC CLASS DEFINITION + * ============================== */ + + var Button = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, $.fn.button.defaults, options) + } + + Button.prototype.setState = function (state) { + var d = 'disabled' + , $el = this.$element + , data = $el.data() + , val = $el.is('input') ? 'val' : 'html' + + state = state + 'Text' + data.resetText || $el.data('resetText', $el[val]()) + + $el[val](data[state] || this.options[state]) + + // push to event loop to allow forms to submit + setTimeout(function () { + state == 'loadingText' ? + $el.addClass(d).attr(d, d) : + $el.removeClass(d).removeAttr(d) + }, 0) + } + + Button.prototype.toggle = function () { + var $parent = this.$element.closest('[data-toggle="buttons-radio"]') + + $parent && $parent + .find('.active') + .removeClass('active') + + this.$element.toggleClass('active') + } + + + /* BUTTON PLUGIN DEFINITION + * ======================== */ + + var old = $.fn.button + + $.fn.button = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('button') + , options = typeof option == 'object' && option + if (!data) $this.data('button', (data = new Button(this, options))) + if (option == 'toggle') data.toggle() + else if (option) data.setState(option) + }) + } + + $.fn.button.defaults = { + loadingText: 'loading...' + } + + $.fn.button.Constructor = Button + + + /* BUTTON NO CONFLICT + * ================== */ + + $.fn.button.noConflict = function () { + $.fn.button = old + return this + } + + + /* BUTTON DATA-API + * =============== */ + + $(document).on('click.button.data-api', '[data-toggle^=button]', function (e) { + var $btn = $(e.target) + if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') + $btn.button('toggle') + }) + +}(window.jQuery);/* ========================================================== + * bootstrap-carousel.js v2.3.1 + * http://twitter.github.com/bootstrap/javascript.html#carousel + * ========================================================== + * Copyright 2012 Twitter, Inc. + * + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + * ========================================================== */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* CAROUSEL CLASS DEFINITION + * ========================= */ + + var Carousel = function (element, options) { + this.$element = $(element) + this.$indicators = this.$element.find('.carousel-indicators') + this.options = options + this.options.pause == 'hover' && this.$element + .on('mouseenter', $.proxy(this.pause, this)) + .on('mouseleave', $.proxy(this.cycle, this)) + } + + Carousel.prototype = { + + cycle: function (e) { + if (!e) this.paused = false + if (this.interval) clearInterval(this.interval); + this.options.interval + && !this.paused + && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) + return this + } + + , getActiveIndex: function () { + this.$active = this.$element.find('.item.active') + this.$items = this.$active.parent().children() + return this.$items.index(this.$active) + } + + , to: function (pos) { + var activeIndex = this.getActiveIndex() + , that = this + + if (pos > (this.$items.length - 1) || pos < 0) return + + if (this.sliding) { + return this.$element.one('slid', function () { + that.to(pos) + }) + } + + if (activeIndex == pos) { + return this.pause().cycle() + } + + return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos])) + } + + , pause: function (e) { + if (!e) this.paused = true + if (this.$element.find('.next, .prev').length && $.support.transition.end) { + this.$element.trigger($.support.transition.end) + this.cycle(true) + } + clearInterval(this.interval) + this.interval = null + return this + } + + , next: function () { + if (this.sliding) return + return this.slide('next') + } + + , prev: function () { + if (this.sliding) return + return this.slide('prev') + } + + , slide: function (type, next) { + var $active = this.$element.find('.item.active') + , $next = next || $active[type]() + , isCycling = this.interval + , direction = type == 'next' ? 'left' : 'right' + , fallback = type == 'next' ? 'first' : 'last' + , that = this + , e + + this.sliding = true + + isCycling && this.pause() + + $next = $next.length ? $next : this.$element.find('.item')[fallback]() + + e = $.Event('slide', { + relatedTarget: $next[0] + , direction: direction + }) + + if ($next.hasClass('active')) return + + if (this.$indicators.length) { + this.$indicators.find('.active').removeClass('active') + this.$element.one('slid', function () { + var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()]) + $nextIndicator && $nextIndicator.addClass('active') + }) + } + + if ($.support.transition && this.$element.hasClass('slide')) { + this.$element.trigger(e) + if (e.isDefaultPrevented()) return + $next.addClass(type) + $next[0].offsetWidth // force reflow + $active.addClass(direction) + $next.addClass(direction) + this.$element.one($.support.transition.end, function () { + $next.removeClass([type, direction].join(' ')).addClass('active') + $active.removeClass(['active', direction].join(' ')) + that.sliding = false + setTimeout(function () { that.$element.trigger('slid') }, 0) + }) + } else { + this.$element.trigger(e) + if (e.isDefaultPrevented()) return + $active.removeClass('active') + $next.addClass('active') + this.sliding = false + this.$element.trigger('slid') + } + + isCycling && this.cycle() + + return this + } + + } + + + /* CAROUSEL PLUGIN DEFINITION + * ========================== */ + + var old = $.fn.carousel + + $.fn.carousel = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('carousel') + , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option) + , action = typeof option == 'string' ? option : options.slide + if (!data) $this.data('carousel', (data = new Carousel(this, options))) + if (typeof option == 'number') data.to(option) + else if (action) data[action]() + else if (options.interval) data.pause().cycle() + }) + } + + $.fn.carousel.defaults = { + interval: 5000 + , pause: 'hover' + } + + $.fn.carousel.Constructor = Carousel + + + /* CAROUSEL NO CONFLICT + * ==================== */ + + $.fn.carousel.noConflict = function () { + $.fn.carousel = old + return this + } + + /* CAROUSEL DATA-API + * ================= */ + + $(document).on('click.carousel.data-api', '[data-slide], [data-slide-to]', function (e) { + var $this = $(this), href + , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 + , options = $.extend({}, $target.data(), $this.data()) + , slideIndex + + $target.carousel(options) + + if (slideIndex = $this.attr('data-slide-to')) { + $target.data('carousel').pause().to(slideIndex).cycle() + } + + e.preventDefault() + }) + +}(window.jQuery);/* ============================================================= + * bootstrap-collapse.js v2.3.1 + * http://twitter.github.com/bootstrap/javascript.html#collapse + * ============================================================= + * Copyright 2012 Twitter, Inc. + * + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + * ============================================================ */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* COLLAPSE PUBLIC CLASS DEFINITION + * ================================ */ + + var Collapse = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, $.fn.collapse.defaults, options) + + if (this.options.parent) { + this.$parent = $(this.options.parent) + } + + this.options.toggle && this.toggle() + } + + Collapse.prototype = { + + constructor: Collapse + + , dimension: function () { + var hasWidth = this.$element.hasClass('width') + return hasWidth ? 'width' : 'height' + } + + , show: function () { + var dimension + , scroll + , actives + , hasData + + if (this.transitioning || this.$element.hasClass('in')) return + + dimension = this.dimension() + scroll = $.camelCase(['scroll', dimension].join('-')) + actives = this.$parent && this.$parent.find('> .accordion-group > .in') + + if (actives && actives.length) { + hasData = actives.data('collapse') + if (hasData && hasData.transitioning) return + actives.collapse('hide') + hasData || actives.data('collapse', null) + } + + this.$element[dimension](0) + this.transition('addClass', $.Event('show'), 'shown') + $.support.transition && this.$element[dimension](this.$element[0][scroll]) + } + + , hide: function () { + var dimension + if (this.transitioning || !this.$element.hasClass('in')) return + dimension = this.dimension() + this.reset(this.$element[dimension]()) + this.transition('removeClass', $.Event('hide'), 'hidden') + this.$element[dimension](0) + } + + , reset: function (size) { + var dimension = this.dimension() + + this.$element + .removeClass('collapse') + [dimension](size || 'auto') + [0].offsetWidth + + this.$element[size !== null ? 'addClass' : 'removeClass']('collapse') + + return this + } + + , transition: function (method, startEvent, completeEvent) { + var that = this + , complete = function () { + if (startEvent.type == 'show') that.reset() + that.transitioning = 0 + that.$element.trigger(completeEvent) + } + + this.$element.trigger(startEvent) + + if (startEvent.isDefaultPrevented()) return + + this.transitioning = 1 + + this.$element[method]('in') + + $.support.transition && this.$element.hasClass('collapse') ? + this.$element.one($.support.transition.end, complete) : + complete() + } + + , toggle: function () { + this[this.$element.hasClass('in') ? 'hide' : 'show']() + } + + } + + + /* COLLAPSE PLUGIN DEFINITION + * ========================== */ + + var old = $.fn.collapse + + $.fn.collapse = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('collapse') + , options = $.extend({}, $.fn.collapse.defaults, $this.data(), typeof option == 'object' && option) + if (!data) $this.data('collapse', (data = new Collapse(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.collapse.defaults = { + toggle: true + } + + $.fn.collapse.Constructor = Collapse + + + /* COLLAPSE NO CONFLICT + * ==================== */ + + $.fn.collapse.noConflict = function () { + $.fn.collapse = old + return this + } + + + /* COLLAPSE DATA-API + * ================= */ + + $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) { + var $this = $(this), href + , target = $this.attr('data-target') + || e.preventDefault() + || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 + , option = $(target).data('collapse') ? 'toggle' : $this.data() + $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed') + $(target).collapse(option) + }) + +}(window.jQuery);/* ============================================================ + * bootstrap-dropdown.js v2.3.1 + * http://twitter.github.com/bootstrap/javascript.html#dropdowns + * ============================================================ + * Copyright 2012 Twitter, Inc. + * + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + * ============================================================ */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* DROPDOWN CLASS DEFINITION + * ========================= */ + + var toggle = '[data-toggle=dropdown]' + , Dropdown = function (element) { + var $el = $(element).on('click.dropdown.data-api', this.toggle) + $('html').on('click.dropdown.data-api', function () { + $el.parent().removeClass('open') + }) + } + + Dropdown.prototype = { + + constructor: Dropdown + + , toggle: function (e) { + var $this = $(this) + , $parent + , isActive + + if ($this.is('.disabled, :disabled')) return + + $parent = getParent($this) + + isActive = $parent.hasClass('open') + + clearMenus() + + if (!isActive) { + $parent.toggleClass('open') + } + + $this.focus() + + return false + } + + , keydown: function (e) { + var $this + , $items + , $active + , $parent + , isActive + , index + + if (!/(38|40|27)/.test(e.keyCode)) return + + $this = $(this) + + e.preventDefault() + e.stopPropagation() + + if ($this.is('.disabled, :disabled')) return + + $parent = getParent($this) + + isActive = $parent.hasClass('open') + + if (!isActive || (isActive && e.keyCode == 27)) { + if (e.which == 27) $parent.find(toggle).focus() + return $this.click() + } + + $items = $('[role=menu] li:not(.divider):visible a', $parent) + + if (!$items.length) return + + index = $items.index($items.filter(':focus')) + + if (e.keyCode == 38 && index > 0) index-- // up + if (e.keyCode == 40 && index < $items.length - 1) index++ // down + if (!~index) index = 0 + + $items + .eq(index) + .focus() + } + + } + + function clearMenus() { + $(toggle).each(function () { + getParent($(this)).removeClass('open') + }) + } + + function getParent($this) { + var selector = $this.attr('data-target') + , $parent + + if (!selector) { + selector = $this.attr('href') + selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } + + $parent = selector && $(selector) + + if (!$parent || !$parent.length) $parent = $this.parent() + + return $parent + } + + + /* DROPDOWN PLUGIN DEFINITION + * ========================== */ + + var old = $.fn.dropdown + + $.fn.dropdown = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('dropdown') + if (!data) $this.data('dropdown', (data = new Dropdown(this))) + if (typeof option == 'string') data[option].call($this) + }) + } + + $.fn.dropdown.Constructor = Dropdown + + + /* DROPDOWN NO CONFLICT + * ==================== */ + + $.fn.dropdown.noConflict = function () { + $.fn.dropdown = old + return this + } + + + /* APPLY TO STANDARD DROPDOWN ELEMENTS + * =================================== */ + + $(document) + .on('click.dropdown.data-api', clearMenus) + .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) + .on('click.dropdown-menu', function (e) { e.stopPropagation() }) + .on('click.dropdown.data-api' , toggle, Dropdown.prototype.toggle) + .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) + +}(window.jQuery); +/* ========================================================= + * bootstrap-modal.js v2.3.1 + * http://twitter.github.com/bootstrap/javascript.html#modals + * ========================================================= + * Copyright 2012 Twitter, Inc. + * + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + * ========================================================= */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* MODAL CLASS DEFINITION + * ====================== */ + + var Modal = function (element, options) { + this.options = options + this.$element = $(element) + .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this)) + this.options.remote && this.$element.find('.modal-body').load(this.options.remote) + } + + Modal.prototype = { + + constructor: Modal + + , toggle: function () { + return this[!this.isShown ? 'show' : 'hide']() + } + + , show: function () { + var that = this + , e = $.Event('show') + + this.$element.trigger(e) + + if (this.isShown || e.isDefaultPrevented()) return + + this.isShown = true + + this.escape() + + this.backdrop(function () { + var transition = $.support.transition && that.$element.hasClass('fade') + + if (!that.$element.parent().length) { + that.$element.appendTo(document.body) //don't move modals dom position + } + + that.$element.show() + + if (transition) { + that.$element[0].offsetWidth // force reflow + } + + that.$element + .addClass('in') + .attr('aria-hidden', false) + + that.enforceFocus() + + transition ? + that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown') }) : + that.$element.focus().trigger('shown') + + }) + } + + , hide: function (e) { + e && e.preventDefault() + + var that = this + + e = $.Event('hide') + + this.$element.trigger(e) + + if (!this.isShown || e.isDefaultPrevented()) return + + this.isShown = false + + this.escape() + + $(document).off('focusin.modal') + + this.$element + .removeClass('in') + .attr('aria-hidden', true) + + $.support.transition && this.$element.hasClass('fade') ? + this.hideWithTransition() : + this.hideModal() + } + + , enforceFocus: function () { + var that = this + $(document).on('focusin.modal', function (e) { + if (that.$element[0] !== e.target && !that.$element.has(e.target).length) { + that.$element.focus() + } + }) + } + + , escape: function () { + var that = this + if (this.isShown && this.options.keyboard) { + this.$element.on('keyup.dismiss.modal', function ( e ) { + e.which == 27 && that.hide() + }) + } else if (!this.isShown) { + this.$element.off('keyup.dismiss.modal') + } + } + + , hideWithTransition: function () { + var that = this + , timeout = setTimeout(function () { + that.$element.off($.support.transition.end) + that.hideModal() + }, 500) + + this.$element.one($.support.transition.end, function () { + clearTimeout(timeout) + that.hideModal() + }) + } + + , hideModal: function () { + var that = this + this.$element.hide() + this.backdrop(function () { + that.removeBackdrop() + that.$element.trigger('hidden') + }) + } + + , removeBackdrop: function () { + this.$backdrop && this.$backdrop.remove() + this.$backdrop = null + } + + , backdrop: function (callback) { + var that = this + , animate = this.$element.hasClass('fade') ? 'fade' : '' + + if (this.isShown && this.options.backdrop) { + var doAnimate = $.support.transition && animate + + this.$backdrop = $('
    ') + .appendTo(document.body) + + this.$backdrop.click( + this.options.backdrop == 'static' ? + $.proxy(this.$element[0].focus, this.$element[0]) + : $.proxy(this.hide, this) + ) + + if (doAnimate) this.$backdrop[0].offsetWidth // force reflow + + this.$backdrop.addClass('in') + + if (!callback) return + + doAnimate ? + this.$backdrop.one($.support.transition.end, callback) : + callback() + + } else if (!this.isShown && this.$backdrop) { + this.$backdrop.removeClass('in') + + $.support.transition && this.$element.hasClass('fade')? + this.$backdrop.one($.support.transition.end, callback) : + callback() + + } else if (callback) { + callback() + } + } + } + + + /* MODAL PLUGIN DEFINITION + * ======================= */ + + var old = $.fn.modal + + $.fn.modal = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('modal') + , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option) + if (!data) $this.data('modal', (data = new Modal(this, options))) + if (typeof option == 'string') data[option]() + else if (options.show) data.show() + }) + } + + $.fn.modal.defaults = { + backdrop: true + , keyboard: true + , show: true + } + + $.fn.modal.Constructor = Modal + + + /* MODAL NO CONFLICT + * ================= */ + + $.fn.modal.noConflict = function () { + $.fn.modal = old + return this + } + + + /* MODAL DATA-API + * ============== */ + + $(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) { + var $this = $(this) + , href = $this.attr('href') + , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7 + , option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data()) + + e.preventDefault() + + $target + .modal(option) + .one('hide', function () { + $this.focus() + }) + }) + +}(window.jQuery); +/* =========================================================== + * bootstrap-tooltip.js v2.3.1 + * http://twitter.github.com/bootstrap/javascript.html#tooltips + * Inspired by the original jQuery.tipsy by Jason Frame + * =========================================================== + * Copyright 2012 Twitter, Inc. + * + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + * ========================================================== */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* TOOLTIP PUBLIC CLASS DEFINITION + * =============================== */ + + var Tooltip = function (element, options) { + this.init('tooltip', element, options) + } + + Tooltip.prototype = { + + constructor: Tooltip + + , init: function (type, element, options) { + var eventIn + , eventOut + , triggers + , trigger + , i + + this.type = type + this.$element = $(element) + this.options = this.getOptions(options) + this.enabled = true + + triggers = this.options.trigger.split(' ') + + for (i = triggers.length; i--;) { + trigger = triggers[i] + if (trigger == 'click') { + this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this)) + } else if (trigger != 'manual') { + eventIn = trigger == 'hover' ? 'mouseenter' : 'focus' + eventOut = trigger == 'hover' ? 'mouseleave' : 'blur' + this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this)) + this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this)) + } + } + + this.options.selector ? + (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : + this.fixTitle() + } + + , getOptions: function (options) { + options = $.extend({}, $.fn[this.type].defaults, this.$element.data(), options) + + if (options.delay && typeof options.delay == 'number') { + options.delay = { + show: options.delay + , hide: options.delay + } + } + + return options + } + + , enter: function (e) { + var defaults = $.fn[this.type].defaults + , options = {} + , self + + this._options && $.each(this._options, function (key, value) { + if (defaults[key] != value) options[key] = value + }, this) + + self = $(e.currentTarget)[this.type](options).data(this.type) + + if (!self.options.delay || !self.options.delay.show) return self.show() + + clearTimeout(this.timeout) + self.hoverState = 'in' + this.timeout = setTimeout(function() { + if (self.hoverState == 'in') self.show() + }, self.options.delay.show) + } + + , leave: function (e) { + var self = $(e.currentTarget)[this.type](this._options).data(this.type) + + if (this.timeout) clearTimeout(this.timeout) + if (!self.options.delay || !self.options.delay.hide) return self.hide() + + self.hoverState = 'out' + this.timeout = setTimeout(function() { + if (self.hoverState == 'out') self.hide() + }, self.options.delay.hide) + } + + , show: function () { + var $tip + , pos + , actualWidth + , actualHeight + , placement + , tp + , e = $.Event('show') + + if (this.hasContent() && this.enabled) { + this.$element.trigger(e) + if (e.isDefaultPrevented()) return + $tip = this.tip() + this.setContent() + + if (this.options.animation) { + $tip.addClass('fade') + } + + placement = typeof this.options.placement == 'function' ? + this.options.placement.call(this, $tip[0], this.$element[0]) : + this.options.placement + + $tip + .detach() + .css({ top: 0, left: 0, display: 'block' }) + + this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element) + + pos = this.getPosition() + + actualWidth = $tip[0].offsetWidth + actualHeight = $tip[0].offsetHeight + + switch (placement) { + case 'bottom': + tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2} + break + case 'top': + tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2} + break + case 'left': + tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth} + break + case 'right': + tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width} + break + } + + this.applyPlacement(tp, placement) + this.$element.trigger('shown') + } + } + + , applyPlacement: function(offset, placement){ + var $tip = this.tip() + , width = $tip[0].offsetWidth + , height = $tip[0].offsetHeight + , actualWidth + , actualHeight + , delta + , replace + + $tip + .offset(offset) + .addClass(placement) + .addClass('in') + + actualWidth = $tip[0].offsetWidth + actualHeight = $tip[0].offsetHeight + + if (placement == 'top' && actualHeight != height) { + offset.top = offset.top + height - actualHeight + replace = true + } + + if (placement == 'bottom' || placement == 'top') { + delta = 0 + + if (offset.left < 0){ + delta = offset.left * -2 + offset.left = 0 + $tip.offset(offset) + actualWidth = $tip[0].offsetWidth + actualHeight = $tip[0].offsetHeight + } + + this.replaceArrow(delta - width + actualWidth, actualWidth, 'left') + } else { + this.replaceArrow(actualHeight - height, actualHeight, 'top') + } + + if (replace) $tip.offset(offset) + } + + , replaceArrow: function(delta, dimension, position){ + this + .arrow() + .css(position, delta ? (50 * (1 - delta / dimension) + "%") : '') + } + + , setContent: function () { + var $tip = this.tip() + , title = this.getTitle() + + $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title) + $tip.removeClass('fade in top bottom left right') + } + + , hide: function () { + var that = this + , $tip = this.tip() + , e = $.Event('hide') + + this.$element.trigger(e) + if (e.isDefaultPrevented()) return + + $tip.removeClass('in') + + function removeWithAnimation() { + var timeout = setTimeout(function () { + $tip.off($.support.transition.end).detach() + }, 500) + + $tip.one($.support.transition.end, function () { + clearTimeout(timeout) + $tip.detach() + }) + } + + $.support.transition && this.$tip.hasClass('fade') ? + removeWithAnimation() : + $tip.detach() + + this.$element.trigger('hidden') + + return this + } + + , fixTitle: function () { + var $e = this.$element + if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { + $e.attr('data-original-title', $e.attr('title') || '').attr('title', '') + } + } + + , hasContent: function () { + return this.getTitle() + } + + , getPosition: function () { + var el = this.$element[0] + return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : { + width: el.offsetWidth + , height: el.offsetHeight + }, this.$element.offset()) + } + + , getTitle: function () { + var title + , $e = this.$element + , o = this.options + + title = $e.attr('data-original-title') + || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) + + return title + } + + , tip: function () { + return this.$tip = this.$tip || $(this.options.template) + } + + , arrow: function(){ + return this.$arrow = this.$arrow || this.tip().find(".tooltip-arrow") + } + + , validate: function () { + if (!this.$element[0].parentNode) { + this.hide() + this.$element = null + this.options = null + } + } + + , enable: function () { + this.enabled = true + } + + , disable: function () { + this.enabled = false + } + + , toggleEnabled: function () { + this.enabled = !this.enabled + } + + , toggle: function (e) { + var self = e ? $(e.currentTarget)[this.type](this._options).data(this.type) : this + self.tip().hasClass('in') ? self.hide() : self.show() + } + + , destroy: function () { + this.hide().$element.off('.' + this.type).removeData(this.type) + } + + } + + + /* TOOLTIP PLUGIN DEFINITION + * ========================= */ + + var old = $.fn.tooltip + + $.fn.tooltip = function ( option ) { + return this.each(function () { + var $this = $(this) + , data = $this.data('tooltip') + , options = typeof option == 'object' && option + if (!data) $this.data('tooltip', (data = new Tooltip(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.tooltip.Constructor = Tooltip + + $.fn.tooltip.defaults = { + animation: true + , placement: 'top' + , selector: false + , template: '
    ' + , trigger: 'hover focus' + , title: '' + , delay: 0 + , html: false + , container: false + } + + + /* TOOLTIP NO CONFLICT + * =================== */ + + $.fn.tooltip.noConflict = function () { + $.fn.tooltip = old + return this + } + +}(window.jQuery); +/* =========================================================== + * bootstrap-popover.js v2.3.1 + * http://twitter.github.com/bootstrap/javascript.html#popovers + * =========================================================== + * Copyright 2012 Twitter, Inc. + * + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + * =========================================================== */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* POPOVER PUBLIC CLASS DEFINITION + * =============================== */ + + var Popover = function (element, options) { + this.init('popover', element, options) + } + + + /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js + ========================================== */ + + Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, { + + constructor: Popover + + , setContent: function () { + var $tip = this.tip() + , title = this.getTitle() + , content = this.getContent() + + $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) + $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content) + + $tip.removeClass('fade top bottom left right in') + } + + , hasContent: function () { + return this.getTitle() || this.getContent() + } + + , getContent: function () { + var content + , $e = this.$element + , o = this.options + + content = (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) + || $e.attr('data-content') + + return content + } + + , tip: function () { + if (!this.$tip) { + this.$tip = $(this.options.template) + } + return this.$tip + } + + , destroy: function () { + this.hide().$element.off('.' + this.type).removeData(this.type) + } + + }) + + + /* POPOVER PLUGIN DEFINITION + * ======================= */ + + var old = $.fn.popover + + $.fn.popover = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('popover') + , options = typeof option == 'object' && option + if (!data) $this.data('popover', (data = new Popover(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.popover.Constructor = Popover + + $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, { + placement: 'right' + , trigger: 'click' + , content: '' + , template: '

    ' + }) + + + /* POPOVER NO CONFLICT + * =================== */ + + $.fn.popover.noConflict = function () { + $.fn.popover = old + return this + } + +}(window.jQuery); +/* ============================================================= + * bootstrap-scrollspy.js v2.3.1 + * http://twitter.github.com/bootstrap/javascript.html#scrollspy + * ============================================================= + * Copyright 2012 Twitter, Inc. + * + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + * ============================================================== */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* SCROLLSPY CLASS DEFINITION + * ========================== */ + + function ScrollSpy(element, options) { + var process = $.proxy(this.process, this) + , $element = $(element).is('body') ? $(window) : $(element) + , href + this.options = $.extend({}, $.fn.scrollspy.defaults, options) + this.$scrollElement = $element.on('scroll.scroll-spy.data-api', process) + this.selector = (this.options.target + || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 + || '') + ' .nav li > a' + this.$body = $('body') + this.refresh() + this.process() + } + + ScrollSpy.prototype = { + + constructor: ScrollSpy + + , refresh: function () { + var self = this + , $targets + + this.offsets = $([]) + this.targets = $([]) + + $targets = this.$body + .find(this.selector) + .map(function () { + var $el = $(this) + , href = $el.data('target') || $el.attr('href') + , $href = /^#\w/.test(href) && $(href) + return ( $href + && $href.length + && [[ $href.position().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]] ) || null + }) + .sort(function (a, b) { return a[0] - b[0] }) + .each(function () { + self.offsets.push(this[0]) + self.targets.push(this[1]) + }) + } + + , process: function () { + var scrollTop = this.$scrollElement.scrollTop() + this.options.offset + , scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight + , maxScroll = scrollHeight - this.$scrollElement.height() + , offsets = this.offsets + , targets = this.targets + , activeTarget = this.activeTarget + , i + + if (scrollTop >= maxScroll) { + return activeTarget != (i = targets.last()[0]) + && this.activate ( i ) + } + + for (i = offsets.length; i--;) { + activeTarget != targets[i] + && scrollTop >= offsets[i] + && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) + && this.activate( targets[i] ) + } + } + + , activate: function (target) { + var active + , selector + + this.activeTarget = target + + $(this.selector) + .parent('.active') + .removeClass('active') + + selector = this.selector + + '[data-target="' + target + '"],' + + this.selector + '[href="' + target + '"]' + + active = $(selector) + .parent('li') + .addClass('active') + + if (active.parent('.dropdown-menu').length) { + active = active.closest('li.dropdown').addClass('active') + } + + active.trigger('activate') + } + + } + + + /* SCROLLSPY PLUGIN DEFINITION + * =========================== */ + + var old = $.fn.scrollspy + + $.fn.scrollspy = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('scrollspy') + , options = typeof option == 'object' && option + if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.scrollspy.Constructor = ScrollSpy + + $.fn.scrollspy.defaults = { + offset: 10 + } + + + /* SCROLLSPY NO CONFLICT + * ===================== */ + + $.fn.scrollspy.noConflict = function () { + $.fn.scrollspy = old + return this + } + + + /* SCROLLSPY DATA-API + * ================== */ + + $(window).on('load', function () { + $('[data-spy="scroll"]').each(function () { + var $spy = $(this) + $spy.scrollspy($spy.data()) + }) + }) + +}(window.jQuery);/* ======================================================== + * bootstrap-tab.js v2.3.1 + * http://twitter.github.com/bootstrap/javascript.html#tabs + * ======================================================== + * Copyright 2012 Twitter, Inc. + * + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + * ======================================================== */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* TAB CLASS DEFINITION + * ==================== */ + + var Tab = function (element) { + this.element = $(element) + } + + Tab.prototype = { + + constructor: Tab + + , show: function () { + var $this = this.element + , $ul = $this.closest('ul:not(.dropdown-menu)') + , selector = $this.attr('data-target') + , previous + , $target + , e + + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } + + if ( $this.parent('li').hasClass('active') ) return + + previous = $ul.find('.active:last a')[0] + + e = $.Event('show', { + relatedTarget: previous + }) + + $this.trigger(e) + + if (e.isDefaultPrevented()) return + + $target = $(selector) + + this.activate($this.parent('li'), $ul) + this.activate($target, $target.parent(), function () { + $this.trigger({ + type: 'shown' + , relatedTarget: previous + }) + }) + } + + , activate: function ( element, container, callback) { + var $active = container.find('> .active') + , transition = callback + && $.support.transition + && $active.hasClass('fade') + + function next() { + $active + .removeClass('active') + .find('> .dropdown-menu > .active') + .removeClass('active') + + element.addClass('active') + + if (transition) { + element[0].offsetWidth // reflow for transition + element.addClass('in') + } else { + element.removeClass('fade') + } + + if ( element.parent('.dropdown-menu') ) { + element.closest('li.dropdown').addClass('active') + } + + callback && callback() + } + + transition ? + $active.one($.support.transition.end, next) : + next() + + $active.removeClass('in') + } + } + + + /* TAB PLUGIN DEFINITION + * ===================== */ + + var old = $.fn.tab + + $.fn.tab = function ( option ) { + return this.each(function () { + var $this = $(this) + , data = $this.data('tab') + if (!data) $this.data('tab', (data = new Tab(this))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.tab.Constructor = Tab + + + /* TAB NO CONFLICT + * =============== */ + + $.fn.tab.noConflict = function () { + $.fn.tab = old + return this + } + + + /* TAB DATA-API + * ============ */ + + $(document).on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { + e.preventDefault() + $(this).tab('show') + }) + +}(window.jQuery);/* ============================================================= + * bootstrap-typeahead.js v2.3.1 + * http://twitter.github.com/bootstrap/javascript.html#typeahead + * ============================================================= + * Copyright 2012 Twitter, Inc. + * + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + * ============================================================ */ + + +!function($){ + + "use strict"; // jshint ;_; + + + /* TYPEAHEAD PUBLIC CLASS DEFINITION + * ================================= */ + + var Typeahead = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, $.fn.typeahead.defaults, options) + this.matcher = this.options.matcher || this.matcher + this.sorter = this.options.sorter || this.sorter + this.highlighter = this.options.highlighter || this.highlighter + this.updater = this.options.updater || this.updater + this.source = this.options.source + this.$menu = $(this.options.menu) + this.shown = false + this.listen() + } + + Typeahead.prototype = { + + constructor: Typeahead + + , select: function () { + var val = this.$menu.find('.active').attr('data-value') + this.$element + .val(this.updater(val)) + .change() + return this.hide() + } + + , updater: function (item) { + return item + } + + , show: function () { + var pos = $.extend({}, this.$element.position(), { + height: this.$element[0].offsetHeight + }) + + this.$menu + .insertAfter(this.$element) + .css({ + top: pos.top + pos.height + , left: pos.left + }) + .show() + + this.shown = true + return this + } + + , hide: function () { + this.$menu.hide() + this.shown = false + return this + } + + , lookup: function (event) { + var items + + this.query = this.$element.val() + + if (!this.query || this.query.length < this.options.minLength) { + return this.shown ? this.hide() : this + } + + items = $.isFunction(this.source) ? this.source(this.query, $.proxy(this.process, this)) : this.source + + return items ? this.process(items) : this + } + + , process: function (items) { + var that = this + + items = $.grep(items, function (item) { + return that.matcher(item) + }) + + items = this.sorter(items) + + if (!items.length) { + return this.shown ? this.hide() : this + } + + return this.render(items.slice(0, this.options.items)).show() + } + + , matcher: function (item) { + return ~item.toLowerCase().indexOf(this.query.toLowerCase()) + } + + , sorter: function (items) { + var beginswith = [] + , caseSensitive = [] + , caseInsensitive = [] + , item + + while (item = items.shift()) { + if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item) + else if (~item.indexOf(this.query)) caseSensitive.push(item) + else caseInsensitive.push(item) + } + + return beginswith.concat(caseSensitive, caseInsensitive) + } + + , highlighter: function (item) { + var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&') + return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) { + return '' + match + '' + }) + } + + , render: function (items) { + var that = this + + items = $(items).map(function (i, item) { + i = $(that.options.item).attr('data-value', item) + i.find('a').html(that.highlighter(item)) + return i[0] + }) + + items.first().addClass('active') + this.$menu.html(items) + return this + } + + , next: function (event) { + var active = this.$menu.find('.active').removeClass('active') + , next = active.next() + + if (!next.length) { + next = $(this.$menu.find('li')[0]) + } + + next.addClass('active') + } + + , prev: function (event) { + var active = this.$menu.find('.active').removeClass('active') + , prev = active.prev() + + if (!prev.length) { + prev = this.$menu.find('li').last() + } + + prev.addClass('active') + } + + , listen: function () { + this.$element + .on('focus', $.proxy(this.focus, this)) + .on('blur', $.proxy(this.blur, this)) + .on('keypress', $.proxy(this.keypress, this)) + .on('keyup', $.proxy(this.keyup, this)) + + if (this.eventSupported('keydown')) { + this.$element.on('keydown', $.proxy(this.keydown, this)) + } + + this.$menu + .on('click', $.proxy(this.click, this)) + .on('mouseenter', 'li', $.proxy(this.mouseenter, this)) + .on('mouseleave', 'li', $.proxy(this.mouseleave, this)) + } + + , eventSupported: function(eventName) { + var isSupported = eventName in this.$element + if (!isSupported) { + this.$element.setAttribute(eventName, 'return;') + isSupported = typeof this.$element[eventName] === 'function' + } + return isSupported + } + + , move: function (e) { + if (!this.shown) return + + switch(e.keyCode) { + case 9: // tab + case 13: // enter + case 27: // escape + e.preventDefault() + break + + case 38: // up arrow + e.preventDefault() + this.prev() + break + + case 40: // down arrow + e.preventDefault() + this.next() + break + } + + e.stopPropagation() + } + + , keydown: function (e) { + this.suppressKeyPressRepeat = ~$.inArray(e.keyCode, [40,38,9,13,27]) + this.move(e) + } + + , keypress: function (e) { + if (this.suppressKeyPressRepeat) return + this.move(e) + } + + , keyup: function (e) { + switch(e.keyCode) { + case 40: // down arrow + case 38: // up arrow + case 16: // shift + case 17: // ctrl + case 18: // alt + break + + case 9: // tab + case 13: // enter + if (!this.shown) return + this.select() + break + + case 27: // escape + if (!this.shown) return + this.hide() + break + + default: + this.lookup() + } + + e.stopPropagation() + e.preventDefault() + } + + , focus: function (e) { + this.focused = true + } + + , blur: function (e) { + this.focused = false + if (!this.mousedover && this.shown) this.hide() + } + + , click: function (e) { + e.stopPropagation() + e.preventDefault() + this.select() + this.$element.focus() + } + + , mouseenter: function (e) { + this.mousedover = true + this.$menu.find('.active').removeClass('active') + $(e.currentTarget).addClass('active') + } + + , mouseleave: function (e) { + this.mousedover = false + if (!this.focused && this.shown) this.hide() + } + + } + + + /* TYPEAHEAD PLUGIN DEFINITION + * =========================== */ + + var old = $.fn.typeahead + + $.fn.typeahead = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('typeahead') + , options = typeof option == 'object' && option + if (!data) $this.data('typeahead', (data = new Typeahead(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.typeahead.defaults = { + source: [] + , items: 8 + , menu: '
      ' + , item: '
      • ' + , minLength: 1 + } + + $.fn.typeahead.Constructor = Typeahead + + + /* TYPEAHEAD NO CONFLICT + * =================== */ + + $.fn.typeahead.noConflict = function () { + $.fn.typeahead = old + return this + } + + + /* TYPEAHEAD DATA-API + * ================== */ + + $(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) { + var $this = $(this) + if ($this.data('typeahead')) return + $this.typeahead($this.data()) + }) + +}(window.jQuery); +/* ========================================================== + * bootstrap-affix.js v2.3.1 + * http://twitter.github.com/bootstrap/javascript.html#affix + * ========================================================== + * Copyright 2012 Twitter, Inc. + * + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + * ========================================================== */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* AFFIX CLASS DEFINITION + * ====================== */ + + var Affix = function (element, options) { + this.options = $.extend({}, $.fn.affix.defaults, options) + this.$window = $(window) + .on('scroll.affix.data-api', $.proxy(this.checkPosition, this)) + .on('click.affix.data-api', $.proxy(function () { setTimeout($.proxy(this.checkPosition, this), 1) }, this)) + this.$element = $(element) + this.checkPosition() + } + + Affix.prototype.checkPosition = function () { + if (!this.$element.is(':visible')) return + + var scrollHeight = $(document).height() + , scrollTop = this.$window.scrollTop() + , position = this.$element.offset() + , offset = this.options.offset + , offsetBottom = offset.bottom + , offsetTop = offset.top + , reset = 'affix affix-top affix-bottom' + , affix + + if (typeof offset != 'object') offsetBottom = offsetTop = offset + if (typeof offsetTop == 'function') offsetTop = offset.top() + if (typeof offsetBottom == 'function') offsetBottom = offset.bottom() + + affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ? + false : offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? + 'bottom' : offsetTop != null && scrollTop <= offsetTop ? + 'top' : false + + if (this.affixed === affix) return + + this.affixed = affix + this.unpin = affix == 'bottom' ? position.top - scrollTop : null + + this.$element.removeClass(reset).addClass('affix' + (affix ? '-' + affix : '')) + } + + + /* AFFIX PLUGIN DEFINITION + * ======================= */ + + var old = $.fn.affix + + $.fn.affix = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('affix') + , options = typeof option == 'object' && option + if (!data) $this.data('affix', (data = new Affix(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.affix.Constructor = Affix + + $.fn.affix.defaults = { + offset: 0 + } + + + /* AFFIX NO CONFLICT + * ================= */ + + $.fn.affix.noConflict = function () { + $.fn.affix = old + return this + } + + + /* AFFIX DATA-API + * ============== */ + + $(window).on('load', function () { + $('[data-spy="affix"]').each(function () { + var $spy = $(this) + , data = $spy.data() + + data.offset = data.offset || {} + + data.offsetBottom && (data.offset.bottom = data.offsetBottom) + data.offsetTop && (data.offset.top = data.offsetTop) + + $spy.affix(data) + }) + }) + + +}(window.jQuery); diff --git a/impl/client/src/main/javascript/web/dojo/dijit/templates/TitlePane.html b/impl/client/src/main/javascript/web/dojo/dijit/templates/TitlePane.html index 6c9dea1eb3..ab367978f8 100644 --- a/impl/client/src/main/javascript/web/dojo/dijit/templates/TitlePane.html +++ b/impl/client/src/main/javascript/web/dojo/dijit/templates/TitlePane.html @@ -1,8 +1,8 @@
      + class="pentaho-titled-toolbar section-header-inner pentaho-padding-sm" data-dojo-attach-point="titleBarNode" id="${id}_titleBarNode">
      -
      diff --git a/impl/client/src/main/javascript/web/dojo/pentaho/common/CheckedMenuItem.html b/impl/client/src/main/javascript/web/dojo/pentaho/common/CheckedMenuItem.html index a8dbbf94d9..b7f93a19d8 100644 --- a/impl/client/src/main/javascript/web/dojo/pentaho/common/CheckedMenuItem.html +++ b/impl/client/src/main/javascript/web/dojo/pentaho/common/CheckedMenuItem.html @@ -3,7 +3,7 @@ ${checkedChar}
      - -
      + Current @@ -46,7 +46,7 @@ diff --git a/impl/client/src/main/javascript/web/dojo/pentaho/common/ListItem.html b/impl/client/src/main/javascript/web/dojo/pentaho/common/ListItem.html index c2214ba7d8..b889baa5a2 100644 --- a/impl/client/src/main/javascript/web/dojo/pentaho/common/ListItem.html +++ b/impl/client/src/main/javascript/web/dojo/pentaho/common/ListItem.html @@ -2,7 +2,7 @@ - + - + diff --git a/impl/client/src/main/javascript/web/dojo/pentaho/common/SectionHeader.html b/impl/client/src/main/javascript/web/dojo/pentaho/common/SectionHeader.html index f8a9d93d13..c273eee717 100644 --- a/impl/client/src/main/javascript/web/dojo/pentaho/common/SectionHeader.html +++ b/impl/client/src/main/javascript/web/dojo/pentaho/common/SectionHeader.html @@ -1,10 +1,10 @@
      -
      +
      - In Use + In Use
      -
      +
      - ${header} + ${header}
      diff --git a/impl/client/src/main/javascript/web/dojo/pentaho/common/SplashScreen.html b/impl/client/src/main/javascript/web/dojo/pentaho/common/SplashScreen.html index 9bbfa6070d..04730751a8 100644 --- a/impl/client/src/main/javascript/web/dojo/pentaho/common/SplashScreen.html +++ b/impl/client/src/main/javascript/web/dojo/pentaho/common/SplashScreen.html @@ -10,7 +10,7 @@
      +
      diff --git a/impl/client/src/main/javascript/web/dojo/pentaho/common/datasourceselect.html b/impl/client/src/main/javascript/web/dojo/pentaho/common/datasourceselect.html index 95657add15..10413131a5 100644 --- a/impl/client/src/main/javascript/web/dojo/pentaho/common/datasourceselect.html +++ b/impl/client/src/main/javascript/web/dojo/pentaho/common/datasourceselect.html @@ -2,7 +2,7 @@ @@ -11,7 +11,7 @@
      - +
      @@ -112,7 +112,7 @@

      UI Styles

      @@ -529,7 +529,7 @@

      UI Styles

      - Data Sources: + Data Sources:
      - Data Sources: + Data Sources: diff --git a/impl/client/src/test/javascript/testSamples/style-samples.html b/impl/client/src/test/javascript/testSamples/style-samples.html index 127c3e3a51..97a9b58d30 100644 --- a/impl/client/src/test/javascript/testSamples/style-samples.html +++ b/impl/client/src/test/javascript/testSamples/style-samples.html @@ -86,7 +86,7 @@

      UI Styles
      - The dialog contents go here. Clicking 'Ok' or 'Cancel' will make the glass pane go away. + The dialog contents go here. Clicking 'Ok' or 'Cancel' will make the glass pane go away.
      - Click the button to show the glasspane + Click the button to show the glasspane -
      +
      @@ -543,7 +543,7 @@

      UI Styles

      - +
      @@ -558,8 +558,8 @@

      UI Styles

      		 -
      - +
      @@ -577,8 +577,8 @@

      UI Styles

      -
      - +
      @@ -596,13 +596,13 @@

      UI Styles

      -
      - +
      +
      @@ -613,8 +613,8 @@

      UI Styles

      - +
      -
      - +
      @@ -633,8 +633,8 @@

      UI Styles

      diff --git a/impl/client/src/test/javascript/testSamples/tabsettest.html b/impl/client/src/test/javascript/testSamples/tabsettest.html index 0c7b744045..db8765e791 100644 --- a/impl/client/src/test/javascript/testSamples/tabsettest.html +++ b/impl/client/src/test/javascript/testSamples/tabsettest.html @@ -98,11 +98,11 @@

      UI Widgets - Tab Set

      -
      +
      -
      - +
      @@ -666,7 +666,7 @@

      UI Styles

      @@ -732,11 +732,11 @@

      UI Styles

      -
      +
      - This is a label + This is a label
      - Section 1 + Section 1
      @@ -751,11 +751,11 @@

      UI Styles

      -
      +
      - + - + @@ -868,7 +868,7 @@

      UI Styles

      - +
      - Section 2 + Section 2
      @@ -773,11 +773,11 @@

      UI Styles

      -
      +
      @@ -816,7 +816,7 @@

      UI Styles

      onmouseover="if(this.className.indexOf('selected') == -1) {this.className='pentaho-listitem pentaho-listitem-hover'}" onmouseout="if(this.className.indexOf('selected') == -1) {this.className='pentaho-listitem'} else {this.className='pentaho-listitem-selected'}" onclick="enabledListManagementButtons(); this.className='pentaho-listitem-selected'"> - Option 2 + Option 2
      - Section 3 + Section 3 @@ -808,7 +808,7 @@

      UI Styles

      onmouseover="if(this.className.indexOf('selected') == -1) {this.className='pentaho-listitem pentaho-listitem-hover'}" onmouseout="if(this.className.indexOf('selected') == -1) {this.className='pentaho-listitem'} else {this.className='pentaho-listitem-selected'}" onclick="enabledListManagementButtons(); this.className='pentaho-listitem-selected'"> - Option 1 + Option 1
      @@ -849,14 +849,14 @@

      UI Styles

      		 Option 1Option 1  
      DisabledDisabled  
      CheckedChecked
      @@ -881,7 +881,7 @@

      UI Styles

      - Tooltip contents + Tooltip contents
      @@ -898,24 +898,24 @@

      UI Styles
      -
      Column 1
      +
      Column 1
      		 -
      Column 2
      +
      Column 2
      		 -
      Column 3
      +
      Column 3
      -
      Data
      +
      Data
      		 -
      Data
      +
      Data
      		 -
      Data
      +
      Data
      - Section 1 + Section 1
      @@ -114,11 +114,11 @@

      UI Widgets - Tab Set

      -
      +
      - Section 2 + Section 2
      From 736ccc4bc84751baeb16d936960707ed773b4292 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9lder=20Freitas?= Date: Tue, 6 Aug 2024 18:54:09 +0100 Subject: [PATCH 27/40] [PPP-4790] sanitize html to address XSS Vulnerabilities (#1782) --- .../web/dojo/pentaho/common/Dialog.js | 651 ++++---- .../web/dojo/pentaho/common/FieldsetPane.js | 87 +- .../web/dojo/pentaho/common/FilterDialog.js | 1391 +++++++++-------- .../web/dojo/pentaho/common/SectionHeader.js | 122 +- .../web/dojo/pentaho/common/SplashScreen.js | 69 +- .../web/dojo/pentaho/common/TabSet.js | 208 +-- .../pentaho/common/TemplatePickerEmbed.js | 339 ++-- .../pentaho/common/propertiesPanel/Panel.js | 18 +- .../vizapi/ccc/sample/sampleVisualization.js | 8 +- 9 files changed, 1479 insertions(+), 1414 deletions(-) diff --git a/impl/client/src/main/javascript/web/dojo/pentaho/common/Dialog.js b/impl/client/src/main/javascript/web/dojo/pentaho/common/Dialog.js index 778aecd92e..0f1d0ada10 100644 --- a/impl/client/src/main/javascript/web/dojo/pentaho/common/Dialog.js +++ b/impl/client/src/main/javascript/web/dojo/pentaho/common/Dialog.js @@ -14,316 +14,341 @@ * limitations under the License. * */ -define(["dojo/_base/declare", "dijit/_WidgetBase", "dijit/_TemplatedMixin", "dijit/_WidgetsInTemplateMixin", "dojo/on", "dojo/dom", "dojo/query", "dojo/dom-construct", "dojo/dom-style", "dijit/Dialog", "pentaho/common/button", "pentaho/common/SmallImageButton", "pentaho/common/Messages", "dojo/dom-class", - "dojo/_base/lang", "dojo/_base/event", "dojo/keys", "common-ui/util/_focus"], - function(declare, _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, on, dom, query, construct, style, Dialog, Button, SmallImageButton, Messages, domClass, lang, event, keys, focusUtil){ - return declare("pentaho.common.Dialog",[_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin], - { - popup : null, - title: "", - getLocaleString: pentaho.common.Messages.getString, - callbacks: [], - shown: false, - buttonsCreated: false, - buttonPanel: null, - hasTitleBar: true, - hasBorder: true, - hasCloseIcon: false, - closeIcon: undefined, - _onCancelCallback: undefined, - responsive: false, - responsiveClasses: undefined, - - dialogOpener: null, - - /** - * Sets the element opening the dialog and to which focus should be restored when the dialog is hidden. - * - * Supports WCAG focus maintenance. - * - * @param {Element} dialogOpener - The element opening the dialog. - */ - setDialogOpener: function(dialogOpener) { - this.dialogOpener = dialogOpener; - }, - - // ElementRefresher: function(Element) : Element - // Supports WCAG focus maintenance. - // Allows "refreshing" the element to use for "refocus" to a corresponding one which is attached - // to the document. Required to deal with UI elements which are discarded and rebuilt. - elementRefresher: function(elem) { - return focusUtil.refreshElement(elem); - }, - - setElementRefresher: function(refresher) { - if (refresher != null) { - this.elementRefresher = refresher; - } else { - delete this.elementRefresher; - } - }, - - setLocalizationLookupFunction: function(f) { - this.getLocaleString = f; - this._localize(); - }, - - buttonClick: function(idx) { - if(this.callbacks[idx]) { - this.callbacks[idx](); - } - }, - - // override this.. - buttons: [], - - // override this.. - _localize: function() { - if(this.getLocaleString) { - for(var i=0; i
      ", - - // * set variables for the template - postMixInProperties: function() { - this.inherited(arguments); - }, - - _createButtonPanel: function() { - this.buttonPanel = construct.create("TABLE"); - style.set(this.buttonPanel, "width", "100%"); - construct.place(this.buttonPanel, this.popup.containerNode); - domClass.add(this.buttonPanel, 'button-panel'); - }, - - _createButtons: function() { - if (this.buttonPanel.rows.length > 0) { - this.buttonPanel.deleteRow(-1); - } - var row = this.buttonPanel.insertRow(-1); - var cell = row.insertCell(-1); - style.set(cell, "align", "right"); - style.set(cell, "width", "100%"); - for(var j=0; j
      ') { - this.popup.buildRendering(); - } - }, - - _attachTemplateNodes: function(rootNode, getAttrFunc){ - this.inherited(arguments); - }, - - _fillContent: function(/*DomNode*/ source){ - - if(!this.templatePath && this.templateString == '
      ') { - this.templateBased = false; - this.width = ''+style.get(source, 'width')+'px'; - this.height = ''+style.get(source, 'height')+'px'; - if(domClass.contains(source, 'hidden' )) { - domClass.remove(source,'hidden'); - } -// this.templateString = source.innerHTML; - this._attachTemplateNodes(source); - this.source = source; -// this.popup = new dijit.Dialog(); - this.popup = new Dialog({title: this.title, content: this.source.innerHTML}); - domClass.add(this.popup.domNode,'pentaho-dialog'); - domClass.remove(this.popup.domNode,'hidden'); - domClass.add(query('.dijitDialogTitleBar',this.popup.domNode)[0],'Caption'); - } else { - this.templateBased = true; - this.popup = new Dialog(); -// this.popup.attr("content", this.domNode); - } - - this.inherited(arguments); - }, - - registerOnCancelCallback: function(f) { - this._onCancelCallback = f; - }, - - /* - * Called when the close icon is clicked. - */ - onCancel: function() { - if (this._onCancelCallback) { - try { - this._onCancelCallback(); - } catch (e) { - console.warn("error in onCancelCallback: " + e); - } - } - this.hide(); - }, - - onHide: function() { - // Callback when popup.onHide() is called - } - }); - }); +define([ + "dojo/_base/declare", + "dijit/_WidgetBase", + "dijit/_TemplatedMixin", + "dijit/_WidgetsInTemplateMixin", + "dojo/on", + "dojo/dom", + "dojo/query", + "dojo/dom-construct", + "dojo/dom-style", + "dijit/Dialog", + "pentaho/common/button", + "pentaho/common/SmallImageButton", + "pentaho/common/Messages", + "dojo/dom-class", + "dojo/_base/lang", + "dojo/_base/event", + "dojo/keys", + "common-ui/util/_focus", + "common-ui/dompurify" +], function(declare, _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, on, dom, query, construct, style, Dialog, + Button, SmallImageButton, Messages, domClass, lang, event, keys, focusUtil, DOMPurify) { + return declare("pentaho.common.Dialog",[_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin], { + popup : null, + title: "", + getLocaleString: pentaho.common.Messages.getString, + callbacks: [], + shown: false, + buttonsCreated: false, + buttonPanel: null, + hasTitleBar: true, + hasBorder: true, + hasCloseIcon: false, + closeIcon: undefined, + _onCancelCallback: undefined, + responsive: false, + responsiveClasses: undefined, + + dialogOpener: null, + + /** + * Returns a sanitized version either of the localized string for the given key or the key itself. + * + * @param {string} localeKey - The key of the localized string. + */ + getSanitizedLocaleString: function(localeKey) { + return DOMPurify.sanitize(this.getLocaleString(localeKey)); + }, + + /** + * Sets the element opening the dialog and to which focus should be restored when the dialog is hidden. + * + * Supports WCAG focus maintenance. + * + * @param {Element} dialogOpener - The element opening the dialog. + */ + setDialogOpener: function(dialogOpener) { + this.dialogOpener = dialogOpener; + }, + + // ElementRefresher: function(Element) : Element + // Supports WCAG focus maintenance. + // Allows "refreshing" the element to use for "refocus" to a corresponding one which is attached + // to the document. Required to deal with UI elements which are discarded and rebuilt. + elementRefresher: function(elem) { + return focusUtil.refreshElement(elem); + }, + + setElementRefresher: function(refresher) { + if (refresher != null) { + this.elementRefresher = refresher; + } else { + delete this.elementRefresher; + } + }, + + setLocalizationLookupFunction: function(f) { + this.getLocaleString = f; + this._localize(); + }, + + buttonClick: function(idx) { + if(this.callbacks[idx]) { + this.callbacks[idx](); + } + }, + + // override this.. + buttons: [], + + // override this.. + _localize: function() { + if(this.getLocaleString) { + for(var i=0; i
      ", + + // * set variables for the template + postMixInProperties: function() { + this.inherited(arguments); + }, + + _createButtonPanel: function() { + this.buttonPanel = construct.create("TABLE"); + style.set(this.buttonPanel, "width", "100%"); + construct.place(this.buttonPanel, this.popup.containerNode); + domClass.add(this.buttonPanel, 'button-panel'); + }, + + _createButtons: function() { + if (this.buttonPanel.rows.length > 0) { + this.buttonPanel.deleteRow(-1); + } + var row = this.buttonPanel.insertRow(-1); + var cell = row.insertCell(-1); + style.set(cell, "align", "right"); + style.set(cell, "width", "100%"); + for(var j=0; j
      ') { + this.popup.buildRendering(); + } + }, + + _attachTemplateNodes: function(rootNode, getAttrFunc){ + this.inherited(arguments); + }, + + _fillContent: function(/*DomNode*/ source){ + + if(!this.templatePath && this.templateString == '
      ') { + this.templateBased = false; + this.width = ''+style.get(source, 'width')+'px'; + this.height = ''+style.get(source, 'height')+'px'; + if(domClass.contains(source, 'hidden' )) { + domClass.remove(source,'hidden'); + } + this._attachTemplateNodes(source); + this.source = source; + this.popup = new Dialog({title: this.title, content: this.source.innerHTML}); + domClass.add(this.popup.domNode,'pentaho-dialog'); + domClass.remove(this.popup.domNode,'hidden'); + domClass.add(query('.dijitDialogTitleBar',this.popup.domNode)[0],'Caption'); + } else { + this.templateBased = true; + this.popup = new Dialog(); + } + + this.inherited(arguments); + }, + + registerOnCancelCallback: function(f) { + this._onCancelCallback = f; + }, + + /* + * Called when the close icon is clicked. + */ + onCancel: function() { + if (this._onCancelCallback) { + try { + this._onCancelCallback(); + } catch (e) { + console.warn("error in onCancelCallback: " + e); + } + } + this.hide(); + }, + + onHide: function() { + // Callback when popup.onHide() is called + } + }); +}); diff --git a/impl/client/src/main/javascript/web/dojo/pentaho/common/FieldsetPane.js b/impl/client/src/main/javascript/web/dojo/pentaho/common/FieldsetPane.js index 9a29d258e9..1d6cc0f5b0 100644 --- a/impl/client/src/main/javascript/web/dojo/pentaho/common/FieldsetPane.js +++ b/impl/client/src/main/javascript/web/dojo/pentaho/common/FieldsetPane.js @@ -1,5 +1,5 @@ /*! - * Copyright 2010 - 2017 Hitachi Vantara. All rights reserved. + * Copyright 2010 - 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. @@ -14,44 +14,55 @@ * limitations under the License. * */ -define(["dojo/_base/declare", "dijit/_WidgetBase", "dijit/_TemplatedMixin", "dijit/_WidgetsInTemplateMixin", "dojo/on", "dojo/query", "dojo/dom-style", - "pentaho/common/FieldsetPane", "pentaho/common/Messages", "pentaho/common/DisableablePanel", "dijit/layout/_LayoutWidget", "dijit/layout/ContentPane", "pentaho/common/Messages", - "dojo/text!pentaho/common/FieldsetPane.html"], - function (declare, _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, on, query, style, FieldsetPane, Messages, DisableablePanel, _LayoutWidget, ContentPane, Messages, templateStr) { - return declare("pentaho.common.FieldsetPane",[DisableablePanel, _TemplatedMixin, _WidgetsInTemplateMixin], - { +define([ + "dojo/_base/declare", + "dijit/_WidgetBase", + "dijit/_TemplatedMixin", + "dijit/_WidgetsInTemplateMixin", + "dojo/on", + "dojo/query", + "dojo/dom-style", + "pentaho/common/FieldsetPane", + "pentaho/common/Messages", + "pentaho/common/DisableablePanel", + "dijit/layout/_LayoutWidget", + "dijit/layout/ContentPane", + "pentaho/common/Messages", + "dojo/text!pentaho/common/FieldsetPane.html", + "common-ui/dompurify" +], function (declare, _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, on, query, style, FieldsetPane, Messages, + DisableablePanel, _LayoutWidget, ContentPane, Messages, templateStr, DOMPurify) { + return declare("pentaho.common.FieldsetPane",[DisableablePanel, _TemplatedMixin, _WidgetsInTemplateMixin], { + templateString: templateStr, + title: "title", + width: "100%", + getLocalString: pentaho.common.Messages.getString, - templateString: templateStr, - title: "title", - width: "100%", - getLocalString: pentaho.common.Messages.getString, + postCreate: function () { + this.inherited(arguments); + this._localize(); + }, - postCreate: function () { - this.inherited(arguments); - this._localize(); - }, + _localize: function () { + var localTitle = this.getLocalString(this.title); + if (localTitle != this.title) { + this.setTitle(localTitle); + } + }, - _localize: function () { - var localTitle = this.getLocalString(this.title); - if (localTitle != this.title) { - this.setTitle(localTitle); - } - }, + setTitle: function (/*String*/ title) { + this.title = title; + this.titleNode.innerHTML = DOMPurify.sanitize(title); + }, - setTitle: function (/*String*/ title) { - this.title = title; - this.titleNode.innerHTML = title; - }, - - layout: function () { - var box = this._borderBox; - var container = this.containerNode; - var header = this.titleNode; - var padding = 20; - style.set(container, { - height: (box.h - header.offsetHeight - padding) + "px" - }); - } - - }); - }); + layout: function () { + var box = this._borderBox; + var container = this.containerNode; + var header = this.titleNode; + var padding = 20; + style.set(container, { + height: (box.h - header.offsetHeight - padding) + "px" + }); + } + }); +}); diff --git a/impl/client/src/main/javascript/web/dojo/pentaho/common/FilterDialog.js b/impl/client/src/main/javascript/web/dojo/pentaho/common/FilterDialog.js index c0b5b7ee9d..05bcf8644c 100644 --- a/impl/client/src/main/javascript/web/dojo/pentaho/common/FilterDialog.js +++ b/impl/client/src/main/javascript/web/dojo/pentaho/common/FilterDialog.js @@ -1,5 +1,5 @@ /*! -* Copyright 2010 - 2023 Hitachi Vantara. All rights reserved. +* Copyright 2010 - 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. @@ -14,746 +14,751 @@ * limitations under the License. * */ -define(["dojo/_base/declare", "dijit/_WidgetBase", "dijit/_TemplatedMixin", "dijit/_WidgetsInTemplateMixin", "dojo/dom-construct", "dojo/on", "dojo/query", "dojo/_base/lang", "dojo/dom-class", "dojo/_base/array", +define([ + "dojo/_base/declare", + "dijit/_WidgetBase", + "dijit/_TemplatedMixin", + "dijit/_WidgetsInTemplateMixin", + "dojo/dom-construct", + "dojo/on", + "dojo/query", + "dojo/_base/lang", + "dojo/dom-class", + "dojo/_base/array", "pentaho/common/Calendar", "pentaho/common/DateTextBox", - 'pentaho/common/Dialog', + "pentaho/common/Dialog", "dojo/keys", - 'pentaho/common/MessageBox', "dojo/text!pentaho/common/FilterDialog.html", "pentaho/common/Messages", "dojo/date/stamp", -"dijit/form/MultiSelect", "common-ui/util/_a11y"], - function(declare, _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, construct, on, query, lang, domClass, array, Calendar, DateTextBox, Dialog, keys, MessageBox, templateStr, Messages, stamp, - MultiSelect, a11yUtil){ - return declare("pentaho.common.FilterDialog",[Dialog,_TemplatedMixin, _WidgetsInTemplateMixin], -{ - templateString: templateStr, - filterType: "PICKLIST", - currentFilter: null, - hasCloseIcon: false, - // Function for retrieving localized strings - - buttons: ['Ok_txt','Cancel_txt'], - - responsive: true, // Not intended to be set to false. - responsiveClasses: "dw-sm ds-fill-viewport-width", - - // Row limit for search list queries - searchListLimit: 500, - - _reauthenticateCallback: null, - - _preSaveCallback: undefined, - _onSuccessCallback: undefined, - _onCancelCallback: undefined, - - errorDialog: undefined, - - // Default numeric format will strip out anything that's not a number or the default decimal separator (a period). - // The easiest way to change this is to update setDecimalSeparator(). - _numericFormatRegex: /[^0-9.]/g, - - postMixInProperties: function() { - this.inherited(arguments); - }, - - postCreate: function() { - this.inherited(arguments); - domClass.add(this.popup.domNode, 'filter-dialog'); - Messages.addUrlBundle('pentaho.common',CONTEXT_PATH+'i18n?plugin=common-ui&name=resources/web/dojo/pentaho/common/nls/messages'); - - this.picklistCombinationTypeIncludeOption.setAttribute("value", pentaho.pda.Column.OPERATOR_TYPES.AND); - this.picklistCombinationTypeExcludeOption.setAttribute("value", pentaho.pda.Column.OPERATOR_TYPES.AND_NOT); - - this.callbacks = [lang.hitch(this, this.save), lang.hitch(this, this.cancel)]; - - this.own( - a11yUtil.makeAccessibleActionButton(this.picklistRemoveAll), - a11yUtil.makeAccessibleActionButton(this.picklistAddAll), - a11yUtil.makeAccessibleActionButton(this.picklistRemoveSelected), - a11yUtil.makeAccessibleActionButton(this.picklistAddSelected), - a11yUtil.makeAccessibleActionButton(this.typePicklistCombinationTypeLinksIncludeLink), - a11yUtil.makeAccessibleActionButton(this.typePicklistCombinationTypeLinksExcludeLink) - ); - - this.errorDialog.setButtons([this.getLocaleString('Ok_txt')]); - this.errorDialog.callbacks = [lang.hitch(this, function() { - this.errorDialog.hide(); - })]; - }, - - _createNumericFormatRegex: function(pattern) { - return new RegExp(pattern, 'g'); - }, - - setDecimalSeparator: function(s) { - this._numericFormatRegex = this._createNumericFormatRegex('[^0-9' + s + ']'); - }, - - onCancel: function() { - this.cancel(); - }, - - _localize: function() { - // TODO replace this with generic code refactored from pir-view.js - this.inherited(arguments); - var decSep = this.getLocaleString("filterDialogDecimalSeparator"); - if (decSep !== undefined && decSep !== "filterDialogDecimalSeparator") { - this.setDecimalSeparator(decSep); - } - this.typePicklistSpan.innerHTML = this.getLocaleString("filterDialogTypePicklistSpan_content"); - this.typeMatchSpan.innerHTML = this.getLocaleString("filterDialogTypeMatchSpan_content"); - this.typeDateRangeSpan.innerHTML = this.getLocaleString("filterDialogTypeDateRangeSpan_content"); - this.picklistHeadingSpan.innerHTML = this.getLocaleString("filterDialogPicklistHeadingSpan_content"); - this.picklistFindButton.innerHTML = this.getLocaleString("filterDialogFindButton_content"); - this.picklistAddSelected.title = this.getLocaleString("filterDialogAddSelected_title"); - this.picklistRemoveSelected.title = this.getLocaleString("filterDialogRemoveSelected_title"); - this.picklistAddAll.title = this.getLocaleString("filterDialogAddAll_title"); - this.picklistRemoveAll.title = this.getLocaleString("filterDialogRemoveAll_title"); - this.parameterNameLabel.innerHTML = this.getLocaleString("filterDialogParameterName_content"); - this.typePicklistCombinationTypeLinksIncludeLink.innerHTML = this.getLocaleString("filterDialogTypePicklistCombinationTypeLinksIncludeLink_content"); - this.typePicklistCombinationTypeLinksExcludeLink.innerHTML = this.getLocaleString("filterDialogTypePicklistCombinationTypeLinksExcludeLink_content"); - this.picklistCombinationTypeIncludeOption.text = this.getLocaleString("filterDialogTypePicklistCombinationTypeIncluded_content"); - this.picklistCombinationTypeExcludeOption.text = this.getLocaleString("filterDialogTypePicklistCombinationTypeExcluded_content"); - this.picklistCombinationTypeSpan.innerHTML = this.getLocaleString("filterDialogTypePicklistCombinationType_label"); - this.matchFieldName.innerHTML = this.getLocaleString("filterDialogFieldName_content"); - this.dateRangeFieldName.innerHTML = this.getLocaleString("filterDialogFieldName_content"); - this.dateRangeBetweenSeparatorSpan.innerHTML = this.getLocaleString("dateRangeBetweenSeparatorSpan_content"); - this.fieldPicklistSpan.innerHTML = this.getLocaleString("filterDialogFieldPicklistSpan_content"); - }, - - _filterTypeChanged: function(event) { - this.setFilterType(event.target.value); - }, - - _setInclusivePicklistFilter: function(event) { - this._setPicklistCombinationTypeLink(pentaho.pda.Column.OPERATOR_TYPES.AND); - this.picklistCombinationType.options[0].selected = true; - }, - - _setExclusivePicklistFilter: function(event) { - this._setPicklistCombinationTypeLink(pentaho.pda.Column.OPERATOR_TYPES.AND_NOT); - this.picklistCombinationType.options[1].selected = true; - }, - - configureFor: function(filter) { - this.currentFilter = filter; - this.currentColumn = this.datasource.getColumnById(this.currentFilter.column); - this.title = this.getLocaleString("FilterDialogTitle") + " " + this.currentColumn.name; - this.picklistLoaded = false; - - this.configureFilterTypesFor(this.currentColumn.dataType); - - if (this.currentFilter.operator === "IN") { - this.setFilterType("PICKLIST"); - } else { - this.setFilterType("MATCH"); - } - this._initParameterUI(); - }, - - /** - * Register a callback function for checking if the filter can be saved at all or not. - * The function should accept the following parameters: - * dialog: this filter dialog - * filter: the current filter being edited - * saveCallback: the function to call if this filter should be saved - * - * The reason this pre-save callback must call the saveCallback instead of returning a result is to allow for prompting of the user - */ - registerPreSaveCallback: function(f) { - this._preSaveCallback = f; - }, - - // Register a callback function for handling reauthentication which itself takes a callback function when authentication is successful - registerReauthenticateCallback: function(f) { - this._reauthenticateCallback = f; - }, - - /** - * Function to call with filter when the user as saved a valid filter. - * This should perform an logic required to actually save the filter. - */ - registerOnSuccessCallback: function(f) { - this._onSuccessCallback = f; - }, - - /** - * Function to call when the user has canceled out of the filter dialog. - * The function will be passed the filter that the dialog was canceled on. - */ - registerOnCancelCallback: function(f) { - this._onCancelCallback = f; - }, - - setDatasource: function(datasource) { - this.datasource = datasource; - }, - - setSearchListLimit: function(limit) { - this.searchListLimit = limit; - }, - - enableFieldSelection: function(enable) { - if(enable) { - domClass.remove(this.fieldPicklistContainer, "filterDialogHidden"); - this.configureFilterTypesFor(null); - this.setFilterType(null); - this.title = this.getLocaleString("FilterDialogTitle"); - } else { - domClass.add(this.fieldPicklistContainer, "filterDialogHidden"); - } - }, - - setFieldList: function( fields ) { - // populate the field list - this.picklistFields.length = 0; - this.fieldList = fields; - var list = this.picklistFields; - var opt = new Option( "" ); - list.options[0] = opt; - for(var idx=0; idx 0 ? parameterName : undefined; - }, - - cancel: function() { - if (this._onCancelCallback) { - try { - this._onCancelCallback(this.currentFilter); - } catch (e) { - if(typeof console !== "undefined") { - console.warn("Error in onCancelCallback of Filter Dialog: " + e); + this.hide(); + return true; + }, + + getParameterName: function() { + var parameterName = this.parameterNameInput.get("value"); + if (parameterName) { + parameterName = lang.trim(parameterName).replace(/[^A-Za-zÀ-ÖØ-öø-ÿ0-9]/g, ""); + } + return parameterName.length > 0 ? parameterName : undefined; + }, + + cancel: function() { + if (this._onCancelCallback) { + try { + this._onCancelCallback(this.currentFilter); + } catch (e) { + if(typeof console !== "undefined") { + console.warn("Error in onCancelCallback of Filter Dialog: " + e); + } } } - } - this.hide(); - }, + this.hide(); + }, - // PICKLIST IMPL - _configurePicklistContainer: function() { - construct.empty(this.picklistUsedValues.domNode); - - this.picklistCombinationType.setAttribute( "value", this.currentFilter.combinationType); - if (this.currentFilter.combinationType === pentaho.pda.Column.OPERATOR_TYPES.AND) { - this.picklistCombinationType.options[0].selected = true; - } else { - this.picklistCombinationType.options[1].selected = true; - } + // PICKLIST IMPL + _configurePicklistContainer: function() { + construct.empty(this.picklistUsedValues.domNode); - // Set the used values - var values = this.currentFilter.value instanceof Array ? this.currentFilter.value : [this.currentFilter.value]; - var idx = 0; - array.forEach(values, function(value) { - if (value != null) { - value = this._unescapeAmpIfExist(value); - var opt = new Option(value, value); - opt.title = value; - this.picklistUsedValues.containerNode.options[idx++] = opt; + this.picklistCombinationType.setAttribute( "value", this.currentFilter.combinationType); + if (this.currentFilter.combinationType === pentaho.pda.Column.OPERATOR_TYPES.AND) { + this.picklistCombinationType.options[0].selected = true; + } else { + this.picklistCombinationType.options[1].selected = true; } - }, this); - // Load all valuesz - if (this.picklistLoaded != true) { - this.picklistFindInput.set("value", ""); - this.filterPicklist(""); - } - }, - - _flagPicklistAvailableValuesLoading: function() { - construct.empty(this.picklistAvailableValues.domNode); - var loadingMsg = this.getLocaleString("filterDialogPicklistLoadingMessage"); - this.picklistAvailableValues.containerNode.options[0] = new Option(loadingMsg, loadingMsg); - }, - - _updatePicklistAvailableValues: function(values) { - construct.empty(this.picklistAvailableValues.domNode); - array.forEach(values, function (result, idx) { - result = this._unescapeAmpIfExist(result); - this.picklistAvailableValues.containerNode.options[idx] = new Option(result, result); - this.picklistAvailableValues.containerNode.options[idx].title = result; - }, this); - this.picklistLoaded = true; - }, - - _unescapeAmpIfExist: function(str) { - if (Array.isArray(str)) { - str.forEach(function(val, index) { - if (typeof val === 'string' || val instanceof String) { - str[index] = val.replace(/&/g, '&'); + // Set the used values + var values = this.currentFilter.value instanceof Array ? this.currentFilter.value : [this.currentFilter.value]; + var idx = 0; + array.forEach(values, function(value) { + if (value != null) { + value = this._unescapeAmpIfExist(value); + var opt = new Option(value, value); + opt.title = value; + this.picklistUsedValues.containerNode.options[idx++] = opt; } - }); - } else if (typeof str === 'string' || str instanceof String) { - str = str.replace(/&/g, '&'); - } - return str; - }, - - _picklistAddSelected: function() { - array.forEach(this.picklistAvailableValues.getSelected(), function(option) { - var found = false; - // Check if we already have the value in the used list - array.some(this.domNode.options, function(usedOption) { - if (usedOption.value === option.value) { - found = true; - return true; + }, this); + + // Load all valuesz + if (this.picklistLoaded != true) { + this.picklistFindInput.set("value", ""); + this.filterPicklist(""); + } + }, + + _flagPicklistAvailableValuesLoading: function() { + construct.empty(this.picklistAvailableValues.domNode); + var loadingMsg = this.getLocaleString("filterDialogPicklistLoadingMessage"); + this.picklistAvailableValues.containerNode.options[0] = new Option(loadingMsg, loadingMsg); + }, + + _updatePicklistAvailableValues: function(values) { + construct.empty(this.picklistAvailableValues.domNode); + array.forEach(values, function (result, idx) { + result = this._unescapeAmpIfExist(result); + this.picklistAvailableValues.containerNode.options[idx] = new Option(result, result); + this.picklistAvailableValues.containerNode.options[idx].title = result; + }, this); + this.picklistLoaded = true; + }, + + _unescapeAmpIfExist: function(str) { + if (Array.isArray(str)) { + str.forEach(function(val, index) { + if (typeof val === 'string' || val instanceof String) { + str[index] = val.replace(/&/g, '&'); + } + }); + } else if (typeof str === 'string' || str instanceof String) { + str = str.replace(/&/g, '&'); + } + return str; + }, + + _picklistAddSelected: function() { + array.forEach(this.picklistAvailableValues.getSelected(), function(option) { + var found = false; + // Check if we already have the value in the used list + array.some(this.domNode.options, function(usedOption) { + if (usedOption.value === option.value) { + found = true; + return true; + } + }); + if (!found) { + this.containerNode.appendChild(lang.clone(option)); } - }); - if (!found) { + }, this.picklistUsedValues); + }, + + _picklistRemoveSelected: function() { + array.forEach(this.picklistUsedValues.getSelected(), function(option) { + this.containerNode.removeChild(option); + }, this.picklistUsedValues); + }, + + _picklistAddAll: function() { + this._picklistRemoveAll(); + array.forEach(this.picklistAvailableValues.containerNode.options, function(option) { this.containerNode.appendChild(lang.clone(option)); + }, this.picklistUsedValues); + }, + + _picklistRemoveAll: function() { + construct.empty(this.picklistUsedValues.domNode); + }, + + _savePicklistContainer: function() { + var values = []; + array.forEach(this.picklistUsedValues.domNode.options, function(option) { + values.push(option.value); + }); + if (values.length == 0) { + this.showErrorDialog(this.getLocaleString('filterDialogMissingValueError_title'), this.getLocaleString('filterDialogMissingValueError_message')); + return false; } - }, this.picklistUsedValues); - }, - - _picklistRemoveSelected: function() { - array.forEach(this.picklistUsedValues.getSelected(), function(option) { - this.containerNode.removeChild(option); - }, this.picklistUsedValues); - }, - - _picklistAddAll: function() { - this._picklistRemoveAll(); - array.forEach(this.picklistAvailableValues.containerNode.options, function(option) { - this.containerNode.appendChild(lang.clone(option)); - }, this.picklistUsedValues); - }, - - _picklistRemoveAll: function() { - construct.empty(this.picklistUsedValues.domNode); - }, - - _savePicklistContainer: function() { - var values = []; - array.forEach(this.picklistUsedValues.domNode.options, function(option) { - values.push(option.value); - }); - if (values.length == 0) { - this.showErrorDialog(this.getLocaleString('filterDialogMissingValueError_title'), this.getLocaleString('filterDialogMissingValueError_message')); - return false; - } - this.currentFilter.operator = pentaho.pda.Column.CONDITION_TYPES.IN; - this.currentFilter.value = values; - this.currentFilter.combinationType = dojo.attr(this.picklistCombinationType, "value"); - return true; - }, - - _picklistFindKeyPressed: function(event) { - if (event.keyCode === keys.ENTER) { - this._filterPicklistByFindInput(); - } - }, + this.currentFilter.operator = pentaho.pda.Column.CONDITION_TYPES.IN; + this.currentFilter.value = values; + this.currentFilter.combinationType = dojo.attr(this.picklistCombinationType, "value"); + return true; + }, + + _picklistFindKeyPressed: function(event) { + if (event.keyCode === keys.ENTER) { + this._filterPicklistByFindInput(); + } + }, - _filterPicklistByFindInput: function() { - var value = this.picklistFindInput.get("value"); - if (this.oldPicklistFindValue !== value) { - this.filterPicklist(value); - this.oldPicklistFindValue = value; - } - }, - - filterPicklist: function(value, reauthentication) { - this._flagPicklistAvailableValuesLoading(); - this.datasource.searchColumn(this.currentColumn, value, this.searchListLimit, lang.hitch(this, function(values) { - this._updatePicklistAvailableValues(values == null ? [] : values.resultset); - if (values == null && this._reauthenticateCallback) { - if (!reauthentication) { - this._reauthenticateCallback(lang.hitch(this, function() { - this.filterPicklist(value, true); - })); - } else { - this.showErrorDialog(this.getLocaleString("filterDialogGeneralError_title"), this.getLocaleString("filterDialogGeneralError_message")); - } + _filterPicklistByFindInput: function() { + var value = this.picklistFindInput.get("value"); + if (this.oldPicklistFindValue !== value) { + this.filterPicklist(value); + this.oldPicklistFindValue = value; } - })); - }, - - _setPicklistCombinationTypeLink: function(combinationType) { - if (this.filterType != "PICKLIST") { - this.setFilterType("PICKLIST"); - } - this.picklistCombinationType.setAttribute("value", combinationType); - }, - - // MATCH IMPL - _isDateType: function() { - return this.currentColumn.dataType === pentaho.pda.Column.DATA_TYPES.DATE; - }, - - _matchComparatorChanged: function() { - var node = this._isDateType() ? this.matchValueInputDate.domNode : this.matchValueInput; - if (this._matchOperatorRequiresValue()) { - domClass.remove(node, "filterDialogHidden"); - } else { - domClass.add(node, "filterDialogHidden"); - } - if (this.matchComparator.value === pentaho.pda.Column.CONDITION_TYPES.IS_NULL || this.matchComparator.value === pentaho.pda.Column.CONDITION_TYPES.NOT_NULL) { - domClass.add(this.parameterContainer, "filterDialogHidden"); - } else { - domClass.remove(this.parameterContainer, "filterDialogHidden"); - } - }, - - _matchOperatorRequiresValue: function() { - return pentaho.pda.Column.SINGLE_COMPARATORS[this.matchComparator.value] == undefined; - }, - - _configureMatchContainer: function() { - this.matchFieldName.innerHTML = this.currentColumn.name.concat(':'); - var value = this.currentFilter.value instanceof Array ? this.currentFilter.value[0] : null; - switch(this.currentColumn.dataType) { - case pentaho.pda.Column.DATA_TYPES.DATE: - this.matchValueInputDate.setValue(stamp.fromISOString(value)); - domClass.remove(this.matchValueInputDate.domNode, "filterDialogHidden"); - domClass.add(this.matchValueInput, "filterDialogHidden"); - break; - case pentaho.pda.Column.DATA_TYPES.NUMERIC: - var value = ""; - array.forEach(this.currentFilter.value, function(val) { - if (val.length > 0) { - if (value.length > 0) { - value += "|"; - } - value += val; + }, + + filterPicklist: function(value, reauthentication) { + this._flagPicklistAvailableValuesLoading(); + this.datasource.searchColumn(this.currentColumn, value, this.searchListLimit, lang.hitch(this, function(values) { + this._updatePicklistAvailableValues(values == null ? [] : values.resultset); + if (values == null && this._reauthenticateCallback) { + if (!reauthentication) { + this._reauthenticateCallback(lang.hitch(this, function() { + this.filterPicklist(value, true); + })); + } else { + this.showErrorDialog(this.getLocaleString("filterDialogGeneralError_title"), this.getLocaleString("filterDialogGeneralError_message")); } - }); - this.matchValueInput.value = value; - domClass.remove(this.matchValueInput, "filterDialogHidden"); - domClass.add(this.matchValueInputDate.domNode, "filterDialogHidden"); - break; - default: - this.matchValueInput.value = value == null ? "" : value; - domClass.remove(this.matchValueInput, "filterDialogHidden"); - domClass.add(this.matchValueInputDate.domNode, "filterDialogHidden"); - break; - } + } + })); + }, - construct.empty(this.matchAggType); - array.forEach(this.currentColumn.availableAggregations, function(aggType, idx) { - this.options[idx] = new Option(pentaho.pda.Column.AGG_TYPES_STRINGS[aggType], aggType); - this.options[idx].title = aggType; - }, this.matchAggType); - if (this.currentFilter.selectedAggType) { - this.matchAggType.value = this.currentFilter.selectedAggType; - } + _setPicklistCombinationTypeLink: function(combinationType) { + if (this.filterType != "PICKLIST") { + this.setFilterType("PICKLIST"); + } + this.picklistCombinationType.setAttribute("value", combinationType); + }, + + // MATCH IMPL + _isDateType: function() { + return this.currentColumn.dataType === pentaho.pda.Column.DATA_TYPES.DATE; + }, + + _matchComparatorChanged: function() { + var node = this._isDateType() ? this.matchValueInputDate.domNode : this.matchValueInput; + if (this._matchOperatorRequiresValue()) { + domClass.remove(node, "filterDialogHidden"); + } else { + domClass.add(node, "filterDialogHidden"); + } + if (this.matchComparator.value === pentaho.pda.Column.CONDITION_TYPES.IS_NULL || this.matchComparator.value === pentaho.pda.Column.CONDITION_TYPES.NOT_NULL) { + domClass.add(this.parameterContainer, "filterDialogHidden"); + } else { + domClass.remove(this.parameterContainer, "filterDialogHidden"); + } + }, - construct.empty(this.matchComparator); - var dataType = this.currentColumn.dataType === pentaho.pda.Column.DATA_TYPES.UNKNOWN ? pentaho.pda.Column.DATA_TYPES.STRING : this.currentColumn.dataType; - array.forEach(pentaho.pda.Column.COMPARATOR[dataType], function(cArray, idx) { - this.options[idx] = new Option(cArray[0], cArray[1]); - this.options[idx].title = cArray[0]; - }, this.matchComparator); - this.matchComparator.value = this.currentFilter.operator === pentaho.pda.Column.CONDITION_TYPES.IN ? pentaho.pda.Column.CONDITION_TYPES.EQUAL : this.currentFilter.operator; - this._matchComparatorChanged(); - }, - - _saveMatchContainer: function() { - this.currentFilter.operator = this.matchComparator.value; - this.currentFilter.selectedAggType = this.matchAggType.value; - this.currentFilter.combinationType = pentaho.pda.Column.OPERATOR_TYPES.AND; - if (!this._matchOperatorRequiresValue()) { - this.currentFilter.value = [""]; - } else { + _matchOperatorRequiresValue: function() { + return pentaho.pda.Column.SINGLE_COMPARATORS[this.matchComparator.value] == undefined; + }, + + _configureMatchContainer: function() { + this.matchFieldName.innerText = this.currentColumn.name.concat(':'); + var value = this.currentFilter.value instanceof Array ? this.currentFilter.value[0] : null; switch(this.currentColumn.dataType) { case pentaho.pda.Column.DATA_TYPES.DATE: - var date = this.matchValueInputDate.getValue(); - if (date == null) { - this.currentFilter.value = [""]; - } else { - // Convert date into format metadata is expecting for dates (ISO8601/RFC3339) - this.currentFilter.value = [stamp.toISOString(date, {selector: 'date'})]; - } + this.matchValueInputDate.setValue(stamp.fromISOString(value)); + domClass.remove(this.matchValueInputDate.domNode, "filterDialogHidden"); + domClass.add(this.matchValueInput, "filterDialogHidden"); break; case pentaho.pda.Column.DATA_TYPES.NUMERIC: - if(this.currentFilter.operator === pentaho.pda.Column.CONDITION_TYPES.EQUAL) { - var value = []; - array.forEach(this.matchValueInput.value.split("|"), function(val) { - var v = this._scrubNumericValue(val); - if (v && v !== "") { - value.push(v); + var value = ""; + array.forEach(this.currentFilter.value, function(val) { + if (val.length > 0) { + if (value.length > 0) { + value += "|"; } - }, this); - this.currentFilter.value = value; - } else { - if (this.matchValueInput.value.indexOf("|") > 0) { - this.showErrorDialog(this.getLocaleString('filterDialogMissingValueError_title'), this.getLocaleString('filterDialogInvalidNumericError_message')); - return false; + value += val; } - this.currentFilter.value = [this._scrubNumericValue(this.matchValueInput.value)]; - } + }); + this.matchValueInput.value = value; + domClass.remove(this.matchValueInput, "filterDialogHidden"); + domClass.add(this.matchValueInputDate.domNode, "filterDialogHidden"); break; default: - this.currentFilter.value = [this.matchValueInput.value]; + this.matchValueInput.value = value == null ? "" : value; + domClass.remove(this.matchValueInput, "filterDialogHidden"); + domClass.add(this.matchValueInputDate.domNode, "filterDialogHidden"); break; } - var hasValue = false; - array.some(this.currentFilter.value, function(val) { - if (val !== "") { - hasValue = true; - return false; - } - }); - if (!hasValue) { - this.showErrorDialog(this.getLocaleString('filterDialogMissingValueError_title'), this.getLocaleString('filterDialogMissingValueError_message')); - return false; + + construct.empty(this.matchAggType); + array.forEach(this.currentColumn.availableAggregations, function(aggType, idx) { + this.options[idx] = new Option(pentaho.pda.Column.AGG_TYPES_STRINGS[aggType], aggType); + this.options[idx].title = aggType; + }, this.matchAggType); + if (this.currentFilter.selectedAggType) { + this.matchAggType.value = this.currentFilter.selectedAggType; } - } - return true; - }, - - _scrubNumericValue: function(val) { - // TODO i18n the thousands and decimal characters - var sign = (val < 0) ? '-' : ''; // PIR-856 retain numeric sign - return sign + lang.trim(val).replace(this._numericFormatRegex, ""); - }, - - /* - * Remove quotes from the filter's value until MQL editor properly supports parsing values with quotes. - */ - _scrubFilterValues: function(filter) { - filter.value = array.map(filter.value, function(value) { - return value.replace(/["]/g,''); - }); - }, - - // DATERANGE IMPL - _configureDateRangeContainer: function() { - this.dateRangeFieldName.innerHTML = this.currentColumn.name; - - this.dateRangeValueInputDate1.value = stamp.fromISOString(this.currentFilter.value); - this.dateRangeValueInputDate2.value = null; - }, - _dateRangeComparatorChanged: function() { - if(typeof console !== "undefined") { - console.log("_dateRangeComparatorChanged() Not yet implemented"); - } - }, - - /** - * Build the textual representation of a filter for display on the Filter Panel. - * @param filter - * @param prompt Is this filter controlled by a prompt? If so the value portion of the filter text will indicate it is controlled by that prompt. - */ - buildFilterText: function(filter, prompt) { - var column = this.datasource.getColumnById(filter.column); - var friendlyOperator = filter.operator; - if (filter.operator == pentaho.pda.Column.CONDITION_TYPES.IN) { - switch (filter.combinationType) { - case pentaho.pda.Column.OPERATOR_TYPES.AND: - friendlyOperator = this.getLocaleString("FilterCombinationTypeIn"); + + construct.empty(this.matchComparator); + var dataType = this.currentColumn.dataType === pentaho.pda.Column.DATA_TYPES.UNKNOWN ? pentaho.pda.Column.DATA_TYPES.STRING : this.currentColumn.dataType; + array.forEach(pentaho.pda.Column.COMPARATOR[dataType], function(cArray, idx) { + this.options[idx] = new Option(cArray[0], cArray[1]); + this.options[idx].title = cArray[0]; + }, this.matchComparator); + this.matchComparator.value = this.currentFilter.operator === pentaho.pda.Column.CONDITION_TYPES.IN ? pentaho.pda.Column.CONDITION_TYPES.EQUAL : this.currentFilter.operator; + this._matchComparatorChanged(); + }, + + _saveMatchContainer: function() { + this.currentFilter.operator = this.matchComparator.value; + this.currentFilter.selectedAggType = this.matchAggType.value; + this.currentFilter.combinationType = pentaho.pda.Column.OPERATOR_TYPES.AND; + if (!this._matchOperatorRequiresValue()) { + this.currentFilter.value = [""]; + } else { + switch(this.currentColumn.dataType) { + case pentaho.pda.Column.DATA_TYPES.DATE: + var date = this.matchValueInputDate.getValue(); + if (date == null) { + this.currentFilter.value = [""]; + } else { + // Convert date into format metadata is expecting for dates (ISO8601/RFC3339) + this.currentFilter.value = [stamp.toISOString(date, {selector: 'date'})]; + } break; - case pentaho.pda.Column.OPERATOR_TYPES.AND_NOT: - friendlyOperator = this.getLocaleString("FilterCombinationTypeNotIn"); + case pentaho.pda.Column.DATA_TYPES.NUMERIC: + if(this.currentFilter.operator === pentaho.pda.Column.CONDITION_TYPES.EQUAL) { + var value = []; + array.forEach(this.matchValueInput.value.split("|"), function(val) { + var v = this._scrubNumericValue(val); + if (v && v !== "") { + value.push(v); + } + }, this); + this.currentFilter.value = value; + } else { + if (this.matchValueInput.value.indexOf("|") > 0) { + this.showErrorDialog(this.getLocaleString('filterDialogMissingValueError_title'), this.getLocaleString('filterDialogInvalidNumericError_message')); + return false; + } + this.currentFilter.value = [this._scrubNumericValue(this.matchValueInput.value)]; + } break; default: - if(typeof console !== "undefined") { - console.log("Unknown filter combination type for IN condition type: " + filter.combinationType); - } + this.currentFilter.value = [this.matchValueInput.value]; + break; } - } else { - // Treat pentaho.pda.Column.DATA_TYPES.UNKNOWN as pentaho.pda.Column.DATA_TYPES.STRING - var dataType = column.dataType == pentaho.pda.Column.DATA_TYPES.UNKNOWN ? pentaho.pda.Column.DATA_TYPES.STRING : column.dataType; - var comparatorMapping = pentaho.pda.Column.COMPARATOR[dataType]; - if (comparatorMapping) { - array.some(comparatorMapping, function(cArray) { - if (cArray[1] === filter.operator) { - friendlyOperator = cArray[0]; - return true; + var hasValue = false; + array.some(this.currentFilter.value, function(val) { + if (val !== "") { + hasValue = true; + return false; } }); + if (!hasValue) { + this.showErrorDialog(this.getLocaleString('filterDialogMissingValueError_title'), this.getLocaleString('filterDialogMissingValueError_message')); + return false; + } } - } - var values = ""; + return true; + }, + + _scrubNumericValue: function(val) { + // TODO i18n the thousands and decimal characters + var sign = (val < 0) ? '-' : ''; // PIR-856 retain numeric sign + return sign + lang.trim(val).replace(this._numericFormatRegex, ""); + }, + + /* + * Remove quotes from the filter's value until MQL editor properly supports parsing values with quotes. + */ + _scrubFilterValues: function(filter) { + filter.value = array.map(filter.value, function(value) { + return value.replace(/["]/g,''); + }); + }, + + // DATERANGE IMPL + _configureDateRangeContainer: function() { + this.dateRangeFieldName.innerText = this.currentColumn.name; + + this.dateRangeValueInputDate1.value = stamp.fromISOString(this.currentFilter.value); + this.dateRangeValueInputDate2.value = null; + }, + _dateRangeComparatorChanged: function() { + if(typeof console !== "undefined") { + console.log("_dateRangeComparatorChanged() Not yet implemented"); + } + }, + + /** + * Build the textual representation of a filter for display on the Filter Panel. + * @param filter + * @param prompt Is this filter controlled by a prompt? If so the value portion of the filter text will indicate it is controlled by that prompt. + */ + buildFilterText: function(filter, prompt) { + var column = this.datasource.getColumnById(filter.column); + var friendlyOperator = filter.operator; + if (filter.operator == pentaho.pda.Column.CONDITION_TYPES.IN) { + switch (filter.combinationType) { + case pentaho.pda.Column.OPERATOR_TYPES.AND: + friendlyOperator = this.getLocaleString("FilterCombinationTypeIn"); + break; + case pentaho.pda.Column.OPERATOR_TYPES.AND_NOT: + friendlyOperator = this.getLocaleString("FilterCombinationTypeNotIn"); + break; + default: + if(typeof console !== "undefined") { + console.log("Unknown filter combination type for IN condition type: " + filter.combinationType); + } + } + } else { + // Treat pentaho.pda.Column.DATA_TYPES.UNKNOWN as pentaho.pda.Column.DATA_TYPES.STRING + var dataType = column.dataType == pentaho.pda.Column.DATA_TYPES.UNKNOWN ? pentaho.pda.Column.DATA_TYPES.STRING : column.dataType; + var comparatorMapping = pentaho.pda.Column.COMPARATOR[dataType]; + if (comparatorMapping) { + array.some(comparatorMapping, function(cArray) { + if (cArray[1] === filter.operator) { + friendlyOperator = cArray[0]; + return true; + } + }); + } + } + var values = ""; - var aggregation = ' '; - if (filter.selectedAggType && filter.selectedAggType.toLowerCase() != 'none') { - aggregation = ' (' + pentaho.pda.Column.AGG_TYPES_STRINGS[filter.selectedAggType] + ') '; - } + var aggregation = ' '; + if (filter.selectedAggType && filter.selectedAggType.toLowerCase() != 'none') { + aggregation = ' (' + pentaho.pda.Column.AGG_TYPES_STRINGS[filter.selectedAggType] + ') '; + } - if (prompt) { - values = this.getLocaleString('FilterTextValueFromPrompt', filter.parameterName); - } else { - if (filter.value != undefined) { - if (filter.value.length > 10) { - values = filter.value.length + " values"; + if (prompt) { + values = this.getLocaleString('FilterTextValueFromPrompt', filter.parameterName); } else { - array.forEach(filter.value, function(value) { - if (values.length > 0) { - values += ", "; - } - values += dojox.html.entities.encode(value); - }, this); + if (filter.value != undefined) { + if (filter.value.length > 10) { + values = filter.value.length + " values"; + } else { + array.forEach(filter.value, function(value) { + if (values.length > 0) { + values += ", "; + } + values += dojox.html.entities.encode(value); + }, this); + } } + } + return column.name + aggregation + friendlyOperator + " " + values; + }, + + // This is broken. You cannot overload functions in Javascript. Further this method is trying to call the second + // without "this." + showErrorDialog: function(message) { + showErrorDialog(this.getLocaleString('ErrorDialog_title'), message); + }, + + showErrorDialog: function(title, message) { + this.errorDialog.setTitle(title); + this.errorDialog.setMessage(message); + this.errorDialog.show(); } - } - return column.name + aggregation + friendlyOperator + " " + values; - }, - - // This is broken. You cannot overload functions in Javascript. Further this method is trying to call the second - // without "this." - showErrorDialog: function(message) { - showErrorDialog(this.getLocaleString('ErrorDialog_title'), message); - }, - - showErrorDialog: function(title, message) { - this.errorDialog.setTitle(title); - this.errorDialog.setMessage(message); - this.errorDialog.show(); - } + }); }); - }); diff --git a/impl/client/src/main/javascript/web/dojo/pentaho/common/SectionHeader.js b/impl/client/src/main/javascript/web/dojo/pentaho/common/SectionHeader.js index e068968bc0..521f55edf8 100644 --- a/impl/client/src/main/javascript/web/dojo/pentaho/common/SectionHeader.js +++ b/impl/client/src/main/javascript/web/dojo/pentaho/common/SectionHeader.js @@ -1,5 +1,5 @@ /*! - * Copyright 2010 - 2017 Hitachi Vantara. All rights reserved. + * Copyright 2010 - 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. @@ -14,73 +14,77 @@ * limitations under the License. * */ -define(["dojo/_base/declare", "dijit/_WidgetBase", "dijit/_Templated", "dojo/on", "dojo/query", "pentaho/common/SmallImageButton", - "dojo/text!pentaho/common/SectionHeader.html", "dojo/_base/lang"], - function (declare, _WidgetBase, _Templated, on, query, SmallImageButton, templateStr, lang) { - return declare("pentaho.common.SectionHeader", +define([ + "dojo/_base/declare", + "dijit/_WidgetBase", + "dijit/_Templated", + "dojo/on", + "dojo/query", + "pentaho/common/SmallImageButton", + "dojo/text!pentaho/common/SectionHeader.html", + "dojo/_base/lang", + "common-ui/dompurify" +], function (declare, _WidgetBase, _Templated, on, query, SmallImageButton, templateStr, lang, DOMPurify) { + return declare("pentaho.common.SectionHeader", [_WidgetBase, _Templated], { + title: '', - [_WidgetBase, _Templated], - { - title: '', - - header: 'header', + header: 'header', - buttonTypes: '', + buttonTypes: '', - headerButtons: [], + headerButtons: [], - id: '', + id: '', - buttonInfo: [], + buttonInfo: [], - height: '20px', + height: '20px', - templateString: templateStr, + templateString: templateStr, - postMixInProperties: function () { - this.inherited(arguments); - }, + postMixInProperties: function () { + this.inherited(arguments); + }, - postCreate: function () { - this.inherited(arguments); - if (this.buttonTypes && this.buttonTypes.length > 0) { - var list = this.buttonTypes.split(','); - var buttonInfo = []; - for (var idx = 0; idx < list.length; idx++) { - var info = { - baseClass: list[idx], - id: '' + this.id + '-button-' + idx, - title: '', - callback: lang.hitch(this, this.buttonClick, idx) - }; - buttonInfo.push(info); - } - this.setButtons(buttonInfo); - } - }, - - setButtons: function (buttonInfo) { - this.buttonInfo = buttonInfo; - this.headerButtons = []; - for (var idx = 0; idx < buttonInfo.length; idx++) { - var button = new SmallImageButton(buttonInfo[idx]); - this.headerButtons.push(button); - // the the button to the section. - var cell = this.table.rows[0].insertCell(-1); - cell.appendChild(button.domNode); - } - }, + postCreate: function () { + this.inherited(arguments); + if (this.buttonTypes && this.buttonTypes.length > 0) { + var list = this.buttonTypes.split(','); + var buttonInfo = []; + for (var idx = 0; idx < list.length; idx++) { + var info = { + baseClass: list[idx], + id: '' + this.id + '-button-' + idx, + title: '', + callback: lang.hitch(this, this.buttonClick, idx) + }; + buttonInfo.push(info); + } + this.setButtons(buttonInfo); + } + }, - buttonClick: function (idx) { - if (this.callbacks && idx < this.callbacks.length) { - this.callbacks[idx](this.headerButtons[idx].id); - } - }, + setButtons: function (buttonInfo) { + this.buttonInfo = buttonInfo; + this.headerButtons = []; + for (var idx = 0; idx < buttonInfo.length; idx++) { + var button = new SmallImageButton(buttonInfo[idx]); + this.headerButtons.push(button); + // the the button to the section. + var cell = this.table.rows[0].insertCell(-1); + cell.appendChild(button.domNode); + } + }, - setHeader: function (/*String*/ header) { - this.header = header; - this.headerNode.innerHTML = header; - } + buttonClick: function (idx) { + if (this.callbacks && idx < this.callbacks.length) { + this.callbacks[idx](this.headerButtons[idx].id); + } + }, - }); - }); + setHeader: function (/*String*/ header) { + this.header = header; + this.headerNode.innerHTML = DOMPurify.sanitize(header); + } + }); +}); diff --git a/impl/client/src/main/javascript/web/dojo/pentaho/common/SplashScreen.js b/impl/client/src/main/javascript/web/dojo/pentaho/common/SplashScreen.js index c9d0530513..fb67b0b6c4 100644 --- a/impl/client/src/main/javascript/web/dojo/pentaho/common/SplashScreen.js +++ b/impl/client/src/main/javascript/web/dojo/pentaho/common/SplashScreen.js @@ -1,5 +1,5 @@ /*! -* Copyright 2010 - 2017 Hitachi Vantara. All rights reserved. +* Copyright 2010 - 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. @@ -14,36 +14,41 @@ * limitations under the License. * */ -define(["dojo/_base/declare", "dijit/_WidgetBase", "dijit/_Templated", "dojo/on", "dojo/query", -"pentaho/common/button", "pentaho/common/Dialog", "dojo/text!pentaho/common/SplashScreen.html"], - function(declare, _WidgetBase, _Templated, on, query, button, Dialog, templateStr){ - return declare("pentaho.common.SplashScreen", [Dialog], - { - buttons: ['ok'], - imagePath: '', - hasTitleBar: false, - responsive: true, // Not intended to be set to false. - responsiveClasses: "dw-sm", - - setTitle: function(title) { - this.splashtitle.innerHTML = title; - }, +define([ + "dojo/_base/declare", + "dijit/_WidgetBase", + "dijit/_Templated", + "dojo/on", + "dojo/query", + "pentaho/common/button", + "pentaho/common/Dialog", + "dojo/text!pentaho/common/SplashScreen.html", + "common-ui/dompurify" +], function(declare, _WidgetBase, _Templated, on, query, button, Dialog, templateStr, DOMPurify) { + return declare("pentaho.common.SplashScreen", [Dialog], { + buttons: ['ok'], + imagePath: '', + hasTitleBar: false, + responsive: true, // Not intended to be set to false. + responsiveClasses: "dw-sm", - setText: function(text) { - this.splashmessage.innerHTML = text; - }, - - setButtonText: function(text) { - this.buttons[0] = text; - query("#button"+0, this.domNode).innerHTML = text; - }, - - templateString: templateStr, - - postCreate: function() { - this.inherited(arguments); - } - + setTitle: function(title) { + this.splashtitle.innerHTML = title; + }, + + setText: function(text) { + this.splashmessage.innerHTML = DOMPurify.sanitize(text); + }, + + setButtonText: function(text) { + this.buttons[0] = text; + query("#button"+0, this.domNode).innerHTML = DOMPurify.sanitize(text); + }, + + templateString: templateStr, + + postCreate: function() { + this.inherited(arguments); } -); - }); + }); +}); diff --git a/impl/client/src/main/javascript/web/dojo/pentaho/common/TabSet.js b/impl/client/src/main/javascript/web/dojo/pentaho/common/TabSet.js index 8a32fc08e4..0c8d736313 100644 --- a/impl/client/src/main/javascript/web/dojo/pentaho/common/TabSet.js +++ b/impl/client/src/main/javascript/web/dojo/pentaho/common/TabSet.js @@ -1,5 +1,5 @@ /*! -* Copyright 2010 - 2023 Hitachi Vantara. All rights reserved. +* Copyright 2010 - 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. @@ -14,107 +14,113 @@ * limitations under the License. * */ -define(["dojo/_base/declare", "dijit/_WidgetBase", "dijit/_Templated", "dojo/on", "dojo/query", "dojo/dom-class", "dijit/registry", "dojo/dom-construct", -"dojo/_base/lang"], - function(declare, _WidgetBase, _Templated, on, query, domClass, registry, construct, lang){ - return declare("pentaho.common.TabSet", - [_WidgetBase, _Templated], - { - templateString: '
      ', - - tabs: [], - - stackContainerId: null, - - setTabs: function( tabs ) { - - if(this.tabSetDiv.childNodes.length>0) { - // we already have tabs - return; - } +define([ + "dojo/_base/declare", + "dijit/_WidgetBase", + "dijit/_Templated", + "dojo/on", + "dojo/query", + "dojo/dom-class", + "dijit/registry", + "dojo/dom-construct", + "dojo/_base/lang", + "common-ui/dompurify" +], function(declare, _WidgetBase, _Templated, on, query, domClass, registry, construct, lang, DOMPurify) { + return declare("pentaho.common.TabSet", [_WidgetBase, _Templated], { + templateString: '
      ', - var _this = this; - this.tabs = tabs; - var html = ""; - domClass.add(this.tabSetDiv, 'pentaho-tabBar'); - this.tabSetDiv.setAttribute("role", "tablist"); - for(var idx=0; idx0) { + // we already have tabs + return; + } + + var _this = this; + this.tabs = tabs; + var html = ""; + domClass.add(this.tabSetDiv, 'pentaho-tabBar'); + this.tabSetDiv.setAttribute("role", "tablist"); + for(var idx=0; idx= this.templates.length); - } - }, - - setTemplates: function (templates) { - this.templates = templates; - this.showPage(); - this.updatePageArrows(); - }, - - showPage: function () { - var start = this.pageNo * 6; - for (var idx = 0; idx < 6; idx++) { - - if (idx + start < this.templates.length) { - this['templateImg' + idx].src = this.templates[idx + start].imagePath; - if (this.templates[idx + start].description && this.templates[idx + start].description != null) { - this['templateImg' + idx].title = this.templates[idx + start].description; - } - this['templateName' + idx].innerHTML = this.templates[idx + start].name; - domClass.remove(this['templateImg' + idx], 'hidden'); - domClass.add(this['templateName' + idx], 'fadeEmbed'); - if (this.templates[idx + start].selected) { - domClass.add(this['templateName' + idx], 'pentaho-selection-dialog-selected'); - domClass.add(this['templateImgCell' + idx], 'pentaho-selection-dialog-selected'); - domClass.remove(this['templateName' + idx], 'pentaho-selection-dialog-unselected'); - domClass.remove(this['templateImgCell' + idx], 'pentaho-selection-dialog-unselected'); - } else { - domClass.add(this['templateName' + idx], 'pentaho-selection-dialog-unselected'); - domClass.add(this['templateImgCell' + idx], 'pentaho-selection-dialog-unselected'); - domClass.remove(this['templateName' + idx], 'pentaho-selection-dialog-selected'); - domClass.remove(this['templateImgCell' + idx], 'pentaho-selection-dialog-selected'); - } - } else { - domClass.add(this['templateImg' + idx], 'hidden'); - domClass.remove(this['templateName' + idx], 'fadeEmbed'); - domClass.add(this['templateImgCell' + idx], 'pentaho-selection-dialog-unselected'); - domClass.remove(this['templateImgCell' + idx], 'pentaho-selection-dialog-selected'); - domClass.remove(this['templateName' + idx], 'pentaho-selection-dialog-selected'); - this['templateName' + idx].innerHTML = ''; - } - } - this.updatePageArrows(); - }, - - postCreate: function () { - this.inherited(arguments); - this.prevSetBtn.callback = lang.hitch(this, this.prevPage); - this.nextSetBtn.callback = lang.hitch(this, this.nextPage); - - for (var idx = 0; idx < 6; idx++) { - on(this['templateImg' + idx], 'click', lang.hitch(this, 'imgClick')); - on(this['templateName' + idx], 'click', lang.hitch(this, 'imgClick')); - on(this['templateImg' + idx], 'dblclick', lang.hitch(this, 'imgDblClick')); - on(this['templateName' + idx], 'dblclick', lang.hitch(this, 'imgDblClick')); - on(this['templateImgCell' + idx], 'mouseover', lang.hitch(this, 'mouseOver')); - on(this['templateImgCell' + idx], 'mouseout', lang.hitch(this, 'mouseOut')); - on(this['templateName' + idx], 'mouseover', lang.hitch(this, 'mouseOver')); - on(this['templateName' + idx], 'mouseout', lang.hitch(this, 'mouseOut')); - } - - }, - - mouseOver: function (event) { - var idx = parseInt(dojo.attr(event.target, 'idx')); - - if (this.templates[idx] && this.templates[idx].selected) { - return; - } - - var node = this['templateImgCell' + idx]; - if (node) { - domClass.add(node, 'pentaho-selection-dialog-hover'); - } - var node = this['templateName' + idx]; - if (node) { - domClass.add(node, 'pentaho-selection-dialog-hover'); - } - }, - - mouseOut: function (event) { - var idx = parseInt(event.target.getAttribute('idx')); - var node = this['templateImgCell' + idx]; - if (node) { - domClass.remove(node, 'pentaho-selection-dialog-hover'); - } - var node = this['templateName' + idx]; - if (node) { - domClass.remove(node, 'pentaho-selection-dialog-hover'); - } - }, - - imgDblClick: function (event) { - var idx = parseInt(event.target.getAttribute('idx')); - var templateNo = this.pageNo * 6 + idx; - if (this.templateDblClickCallback) { - this.templateDblClickCallback(templateNo); - } - }, - - imgClick: function (event) { - var idx = parseInt(event.target.getAttribute('idx')); - var templateNo = this.pageNo * 6 + idx; - this.select(idx, templateNo); - if (this.templateSelectedCallback) { - this.templateSelectedCallback(templateNo); - } - }, - - prevPage: function () { - if (this.pageNo == 0) { - return; - } - this.pageNo--; - this.showPage(); - }, - - nextPage: function () { - if ((this.pageNo + 1) * 6 >= this.templates.length) { - return; - } - this.pageNo++; - this.showPage(); - }, - - select: function (idx, templateNo) { - for (var n = 0; n < this.templates.length; n++) { - this.templates[n].selected = false; - } - this.templates[templateNo].selected = true; - var node = this['templateImgCell' + idx]; - domClass.remove(node, 'pentaho-selection-dialog-hover'); - var node = this['templateName' + idx]; - domClass.remove(node, 'pentaho-selection-dialog-hover'); - this.showPage(); - } - - }); - }); +define([ + "dojo/_base/declare", + "dijit/_WidgetBase", + "dijit/_TemplatedMixin", + "dijit/_WidgetsInTemplateMixin", + "dojo/on", + "dojo/query", + "pentaho/common/button", + "pentaho/common/SmallImageButton", + "dojo/dom-class", + "dojo/text!pentaho/common/TemplatePickerEmbed.html", + "dojo/_base/lang", + "common-ui/dompurify" +], function(declare, _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, on, query, button, SmallImageButton, domClass, + templateStr, lang, DOMPurify) { + return declare("pentaho.common.TemplatePickerEmbed",[_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin], { + buttons: [], + + templates: [], + + pageNo: 0, + + hasTitleBar: false, + + hasBorder: false, + + templateSelectedCallback: null, + + templateString: templateStr, + + updatePageArrows: function () { + if (this.prevSetBtn.set) { + this.prevSetBtn.set('disabled', this.pageNo == 0); + } + if (this.nextSetBtn.set) { + this.nextSetBtn.set('disabled', (this.pageNo + 1) * 6 >= this.templates.length); + } + }, + + setTemplates: function (templates) { + this.templates = templates; + this.showPage(); + this.updatePageArrows(); + }, + + showPage: function () { + var start = this.pageNo * 6; + for (var idx = 0; idx < 6; idx++) { + + if (idx + start < this.templates.length) { + this['templateImg' + idx].src = this.templates[idx + start].imagePath; + if (this.templates[idx + start].description && this.templates[idx + start].description != null) { + this['templateImg' + idx].title = this.templates[idx + start].description; + } + this['templateName' + idx].innerHTML = DOMPurify.sanitize(this.templates[idx + start].name); + domClass.remove(this['templateImg' + idx], 'hidden'); + domClass.add(this['templateName' + idx], 'fadeEmbed'); + if (this.templates[idx + start].selected) { + domClass.add(this['templateName' + idx], 'pentaho-selection-dialog-selected'); + domClass.add(this['templateImgCell' + idx], 'pentaho-selection-dialog-selected'); + domClass.remove(this['templateName' + idx], 'pentaho-selection-dialog-unselected'); + domClass.remove(this['templateImgCell' + idx], 'pentaho-selection-dialog-unselected'); + } else { + domClass.add(this['templateName' + idx], 'pentaho-selection-dialog-unselected'); + domClass.add(this['templateImgCell' + idx], 'pentaho-selection-dialog-unselected'); + domClass.remove(this['templateName' + idx], 'pentaho-selection-dialog-selected'); + domClass.remove(this['templateImgCell' + idx], 'pentaho-selection-dialog-selected'); + } + } else { + domClass.add(this['templateImg' + idx], 'hidden'); + domClass.remove(this['templateName' + idx], 'fadeEmbed'); + domClass.add(this['templateImgCell' + idx], 'pentaho-selection-dialog-unselected'); + domClass.remove(this['templateImgCell' + idx], 'pentaho-selection-dialog-selected'); + domClass.remove(this['templateName' + idx], 'pentaho-selection-dialog-selected'); + this['templateName' + idx].innerHTML = ''; + } + } + this.updatePageArrows(); + }, + + postCreate: function () { + this.inherited(arguments); + this.prevSetBtn.callback = lang.hitch(this, this.prevPage); + this.nextSetBtn.callback = lang.hitch(this, this.nextPage); + + for (var idx = 0; idx < 6; idx++) { + on(this['templateImg' + idx], 'click', lang.hitch(this, 'imgClick')); + on(this['templateName' + idx], 'click', lang.hitch(this, 'imgClick')); + on(this['templateImg' + idx], 'dblclick', lang.hitch(this, 'imgDblClick')); + on(this['templateName' + idx], 'dblclick', lang.hitch(this, 'imgDblClick')); + on(this['templateImgCell' + idx], 'mouseover', lang.hitch(this, 'mouseOver')); + on(this['templateImgCell' + idx], 'mouseout', lang.hitch(this, 'mouseOut')); + on(this['templateName' + idx], 'mouseover', lang.hitch(this, 'mouseOver')); + on(this['templateName' + idx], 'mouseout', lang.hitch(this, 'mouseOut')); + } + + }, + + mouseOver: function (event) { + var idx = parseInt(dojo.attr(event.target, 'idx')); + + if (this.templates[idx] && this.templates[idx].selected) { + return; + } + + var node = this['templateImgCell' + idx]; + if (node) { + domClass.add(node, 'pentaho-selection-dialog-hover'); + } + var node = this['templateName' + idx]; + if (node) { + domClass.add(node, 'pentaho-selection-dialog-hover'); + } + }, + + mouseOut: function (event) { + var idx = parseInt(event.target.getAttribute('idx')); + var node = this['templateImgCell' + idx]; + if (node) { + domClass.remove(node, 'pentaho-selection-dialog-hover'); + } + var node = this['templateName' + idx]; + if (node) { + domClass.remove(node, 'pentaho-selection-dialog-hover'); + } + }, + + imgDblClick: function (event) { + var idx = parseInt(event.target.getAttribute('idx')); + var templateNo = this.pageNo * 6 + idx; + if (this.templateDblClickCallback) { + this.templateDblClickCallback(templateNo); + } + }, + + imgClick: function (event) { + var idx = parseInt(event.target.getAttribute('idx')); + var templateNo = this.pageNo * 6 + idx; + this.select(idx, templateNo); + if (this.templateSelectedCallback) { + this.templateSelectedCallback(templateNo); + } + }, + + prevPage: function () { + if (this.pageNo == 0) { + return; + } + this.pageNo--; + this.showPage(); + }, + + nextPage: function () { + if ((this.pageNo + 1) * 6 >= this.templates.length) { + return; + } + this.pageNo++; + this.showPage(); + }, + + select: function (idx, templateNo) { + for (var n = 0; n < this.templates.length; n++) { + this.templates[n].selected = false; + } + this.templates[templateNo].selected = true; + var node = this['templateImgCell' + idx]; + domClass.remove(node, 'pentaho-selection-dialog-hover'); + var node = this['templateName' + idx]; + domClass.remove(node, 'pentaho-selection-dialog-hover'); + this.showPage(); + } + }); +}); diff --git a/impl/client/src/main/javascript/web/dojo/pentaho/common/propertiesPanel/Panel.js b/impl/client/src/main/javascript/web/dojo/pentaho/common/propertiesPanel/Panel.js index 013d042241..50f83ac743 100644 --- a/impl/client/src/main/javascript/web/dojo/pentaho/common/propertiesPanel/Panel.js +++ b/impl/client/src/main/javascript/web/dojo/pentaho/common/propertiesPanel/Panel.js @@ -1,5 +1,5 @@ /*! - * Copyright 2010 - 2023 Hitachi Vantara. All rights reserved. + * Copyright 2010 - 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. @@ -48,14 +48,12 @@ define([ "pentaho/common/Messages", "pentaho/common/propertiesPanel/Configuration", "common-ui/util/_focus", - "dijit/Tooltip" -], function(declare, ItemFileReadStore, - registry, _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, ContentPane, - BorderContainer, HorizontalSlider, TextBox, ComboBox, - Select, CheckBox, TitlePane, - on, query, array, lang, html, construct, string, domClass, - Target, Source, ManagerClass, Evented, topic, dom, geometry, aspect, - Messages, Configuration, focusUtil, Tooltip) { + "dijit/Tooltip", + "common-ui/dompurify" +], function(declare, ItemFileReadStore, registry, _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, ContentPane, + BorderContainer, HorizontalSlider, TextBox, ComboBox, Select, CheckBox, TitlePane, on, query, array, lang, + html, construct, string, domClass, Target, Source, ManagerClass, Evented, topic, dom, geometry, aspect, + Messages, Configuration, focusUtil, Tooltip, DOMPurify) { /* eslint-disable dot-notation, new-cap */ @@ -1323,7 +1321,7 @@ define([ if(!gemLabel){ gemLabel=query(".gem-label", this.domNode)[0]; } - gemLabel.innerHTML = this.model.value; + gemLabel.innerHTML = DOMPurify.sanitize(this.model.value); this.own( on(this.domNode, "mousedown", lang.hitch(this, "onMouseDown")), diff --git a/impl/client/src/main/javascript/web/vizapi/ccc/sample/sampleVisualization.js b/impl/client/src/main/javascript/web/vizapi/ccc/sample/sampleVisualization.js index 54701ca2e6..0dfde4ef34 100644 --- a/impl/client/src/main/javascript/web/vizapi/ccc/sample/sampleVisualization.js +++ b/impl/client/src/main/javascript/web/vizapi/ccc/sample/sampleVisualization.js @@ -1,5 +1,5 @@ /*! -* Copyright 2010 - 2017 Hitachi Vantara. All rights reserved. +* Copyright 2010 - 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. @@ -15,7 +15,9 @@ * */ -require(["common-ui/vizapi/VizController"], function(){ +require([ + "common-ui/vizapi/VizController" +], function(_VizController) { pentaho.visualizations.push({ id: 'sample_calc', // unique identifier @@ -121,7 +123,7 @@ require(["common-ui/vizapi/VizController"], function(){ } - this.numSpan.innerHTML = value == null ? "" : value; + this.numSpan.innerText = value == null ? "" : value; this.resize(); } }); From 457e8d4d46586b25ee7574afb417f995ca02292c Mon Sep 17 00:00:00 2001 From: Peter Rinehart Date: Thu, 22 Aug 2024 14:58:11 -0400 Subject: [PATCH 28/40] [PPP-4174] Migrate axis2 web services to jax-rs and remove axis2 libraries. --- .../src/main/resources/plugin.xml | 22 - .../main/javascript/web/dataapi/models-mql.js | 20 +- .../src/main/javascript/web/repo/state.js | 8 +- .../metadata/service/MetadataService2IT.java | 1001 ----------------- .../metadata/service/MetadataServiceIT.java | 749 ------------ .../ui/services/UserSettingServiceIT.java | 92 -- .../ui/metadata/service/MetadataService.java | 442 -------- .../ui/metadata/service/MetadataService2.java | 449 -------- .../metadata/service/MetadataServiceUtil.java | 421 ------- .../service/MetadataServiceUtil2.java | 423 ------- .../ui/services/SolutionRepoService.java | 194 ---- .../ui/services/UserSettingService.java | 140 --- .../common/ui/messages/messages.properties | 24 - .../common/ui/messages/messages_CN.properties | 25 - .../common/ui/messages/messages_de.properties | 24 - .../common/ui/messages/messages_fr.properties | 24 - .../common/ui/messages/messages_ja.properties | 25 - .../ui/messages/messages_zh_CN.properties | 24 - .../common/ui/TestUserSettingService.java | 87 -- .../service/MetadataService2Test.java | 302 ----- .../metadata/service/MetadataServiceTest.java | 329 ------ .../service/MetadataServiceUtil2Test.java | 348 ------ .../service/MetadataServiceUtilTest.java | 347 ------ .../service/SolutionRepoServiceTest.java | 69 -- 24 files changed, 11 insertions(+), 5578 deletions(-) delete mode 100644 impl/server/src/it/java/org/pentaho/common/ui/metadata/service/MetadataService2IT.java delete mode 100644 impl/server/src/it/java/org/pentaho/common/ui/metadata/service/MetadataServiceIT.java delete mode 100644 impl/server/src/it/java/org/pentaho/common/ui/services/UserSettingServiceIT.java delete mode 100644 impl/server/src/main/java/org/pentaho/common/ui/metadata/service/MetadataService.java delete mode 100644 impl/server/src/main/java/org/pentaho/common/ui/metadata/service/MetadataService2.java delete mode 100644 impl/server/src/main/java/org/pentaho/common/ui/metadata/service/MetadataServiceUtil.java delete mode 100644 impl/server/src/main/java/org/pentaho/common/ui/metadata/service/MetadataServiceUtil2.java delete mode 100644 impl/server/src/main/java/org/pentaho/common/ui/services/SolutionRepoService.java delete mode 100644 impl/server/src/main/java/org/pentaho/common/ui/services/UserSettingService.java delete mode 100644 impl/server/src/test/java/org/pentaho/common/ui/TestUserSettingService.java delete mode 100644 impl/server/src/test/java/org/pentaho/common/ui/metadata/service/MetadataService2Test.java delete mode 100644 impl/server/src/test/java/org/pentaho/common/ui/metadata/service/MetadataServiceTest.java delete mode 100644 impl/server/src/test/java/org/pentaho/common/ui/metadata/service/MetadataServiceUtil2Test.java delete mode 100644 impl/server/src/test/java/org/pentaho/common/ui/metadata/service/MetadataServiceUtilTest.java delete mode 100644 impl/server/src/test/java/org/pentaho/common/ui/metadata/service/SolutionRepoServiceTest.java diff --git a/assemblies/platform-plugin/src/main/resources/plugin.xml b/assemblies/platform-plugin/src/main/resources/plugin.xml index dc34a6f253..dc5373e181 100644 --- a/assemblies/platform-plugin/src/main/resources/plugin.xml +++ b/assemblies/platform-plugin/src/main/resources/plugin.xml @@ -27,28 +27,6 @@ ChartSeriesColorService - - - - - - - - content/common-ui/resources/web/dojo/djConfig.js content/common-ui/resources/web/cache/cache-service.js diff --git a/impl/client/src/main/javascript/web/dataapi/models-mql.js b/impl/client/src/main/javascript/web/dataapi/models-mql.js index d9fb53a82a..b98d0989fe 100644 --- a/impl/client/src/main/javascript/web/dataapi/models-mql.js +++ b/impl/client/src/main/javascript/web/dataapi/models-mql.js @@ -22,7 +22,7 @@ define("common-data/models-mql", ['common-data/oop', 'common-data/controller', ' pentaho.pda.MqlHandler = function mqlHandler(sandbox) { pentaho.pda.Handler.call(this, sandbox); this.type = pentaho.pda.SOURCE_TYPE_MQL; - this.METADATA_SERVICE_URL = '../../../../content/ws-run/metadataService'; + this.METADATA_SERVICE_URL = '../../../../plugin/data-access/api/metadataDA'; } inheritPrototype(pentaho.pda.MqlHandler, pentaho.pda.Handler); //borrow the parent's methods @@ -59,7 +59,7 @@ pentaho.pda.MqlHandler.prototype.getSources = function(callback, options) { // parse the XML var xml = parseXML( result ), - nodes = xml.getElementsByTagName('return'); + nodes = xml.getElementsByTagName('modelInfo'); for( var idx=0; idx 0 ) { //return this.getDetailFromNode( nodes[0], modelAccess, datasourceConfig ); // get the categories @@ -314,10 +314,7 @@ pentaho.pda.model.mql.prototype.submit = function( jsonString, rowLimit, callbac if (!rowLimit) { rowLimit = -1; } - var handleResultCallback = dojo.hitch(this, function(resultXml) { - var result = parseXML( resultXml ); - var nodes = result.getElementsByTagName('return'); - resultJson = this.getText( nodes[0] ); + var handleResultCallback = dojo.hitch(this, function(resultJson) { // alert(resultJson); var result = JSON.parse(resultJson); if (callback) { @@ -357,10 +354,7 @@ pentaho.pda.model.mql.prototype.submitXmlQuery = function( queryObject, rowLimit var url = this.handler.METADATA_SERVICE_URL+'/doXmlQueryToCdaJson'; var query = 'xml='+escape(xml)+'&rowLimit='+rowLimit; - var resultXml = pentahoGet( url, query ); - var result = parseXML( resultXml ); - var nodes = result.getElementsByTagName('return'); - resultJson = this.getText( nodes[0] ); + resultJson = pentahoGet( url, query ); // alert(resultJson); var result = JSON.parse(resultJson); return result; diff --git a/impl/client/src/main/javascript/web/repo/state.js b/impl/client/src/main/javascript/web/repo/state.js index cbaab24898..aec034d7ed 100644 --- a/impl/client/src/main/javascript/web/repo/state.js +++ b/impl/client/src/main/javascript/web/repo/state.js @@ -263,11 +263,11 @@ pentaho.userSettings.prototype.generateUniqueUrl = function(url) { pentaho.userSettings.prototype.getSettings = function( names, callback, caller ) { dojo.xhrGet({ - url: this.generateUniqueUrl(CONTEXT_PATH + 'content/ws-run/UserSettingService/getUserSettingsJson'), + url: this.generateUniqueUrl(CONTEXT_PATH + 'plugin/pentaho-interactive-reporting/api/UserSettingService/getUserSettingsJson'), content: { settingNames : names }, - load: dojo.hitch(caller, function(data) { callback(controller.getJsonFromXml(data)); }), + load: dojo.hitch(caller, function(data) { callback(controller.getJsonFromResult(data)); }), error: function(data) {alert(data)} }); } @@ -278,13 +278,13 @@ pentaho.userSettings.prototype.getSettings = function( names, callback, caller ) pentaho.userSettings.prototype.setSetting = function( name, value, callback, caller ) { dojo.xhrGet({ - url: this.generateUniqueUrl(CONTEXT_PATH + 'content/ws-run/UserSettingService/setUserSettingJson'), + url: this.generateUniqueUrl(CONTEXT_PATH + 'plugin/pentaho-interactive-reporting/api/UserSettingService/setUserSettingJson'), content: { settingName : name, settingValue : value }, load: dojo.hitch(caller, function(data) { - callback(controller.getJsonFromXml(data)); + callback(controller.getJsonFromResult(data)); }), error: function(data) {alert(data)} }); diff --git a/impl/server/src/it/java/org/pentaho/common/ui/metadata/service/MetadataService2IT.java b/impl/server/src/it/java/org/pentaho/common/ui/metadata/service/MetadataService2IT.java deleted file mode 100644 index d639aafeec..0000000000 --- a/impl/server/src/it/java/org/pentaho/common/ui/metadata/service/MetadataService2IT.java +++ /dev/null @@ -1,1001 +0,0 @@ -/*! - * This program is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License, version 2.1 as published by the Free Software - * Foundation. - * - * You should have received a copy of the GNU Lesser General Public License along with this - * program; if not, you can obtain a copy at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html - * or from the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU Lesser General Public License for more details. - * - * Copyright (c) 2002-2017 Hitachi Vantara.. All rights reserved. - */ - -package org.pentaho.common.ui.metadata.service; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.io.IOUtils; -import org.jmock.Mockery; -import org.jmock.integration.junit4.JUnit4Mockery; -import org.json.JSONException; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; -import org.pentaho.commons.connection.marshal.MarshallableResultSet; -import org.pentaho.di.core.exception.KettleException; -import org.pentaho.metadata.model.Domain; -import org.pentaho.metadata.model.concept.types.AggregationType; -import org.pentaho.metadata.model.concept.types.DataType; -import org.pentaho.metadata.model.thin.Condition; -import org.pentaho.metadata.model.thin.Element; -import org.pentaho.metadata.model.thin.Model; -import org.pentaho.metadata.model.thin.ModelInfo; -import org.pentaho.metadata.model.thin.Operator; -import org.pentaho.metadata.model.thin.Order; -import org.pentaho.metadata.model.thin.Parameter; -import org.pentaho.metadata.model.thin.Query; -import org.pentaho.metadata.query.model.CombinationType; -import org.pentaho.metadata.query.model.util.QueryXmlHelper; -import org.pentaho.metadata.repository.IMetadataDomainRepository; -import org.pentaho.metadata.repository.InMemoryMetadataDomainRepository; -import org.pentaho.metadata.util.XmiParser; -import org.pentaho.platform.api.data.IDBDatasourceService; -import org.pentaho.platform.api.engine.IPentahoDefinableObjectFactory; -import org.pentaho.platform.api.engine.IPluginManager; -import org.pentaho.platform.api.engine.IPluginProvider; -import org.pentaho.platform.api.engine.ISolutionEngine; -import org.pentaho.platform.api.repository2.unified.IUnifiedRepository; -import org.pentaho.platform.engine.core.system.PentahoSessionHolder; -import org.pentaho.platform.engine.core.system.StandaloneSession; -import org.pentaho.platform.engine.core.system.boot.PlatformInitializationException; -import org.pentaho.platform.engine.services.connection.datasource.dbcp.JndiDatasourceService; -import org.pentaho.platform.engine.services.solution.SolutionEngine; -import org.pentaho.platform.plugin.action.kettle.KettleSystemListener; -import org.pentaho.platform.plugin.services.connections.sql.SQLConnection; -import org.pentaho.platform.plugin.services.pluginmgr.DefaultPluginManager; -import org.pentaho.platform.plugin.services.pluginmgr.FileSystemXmlPluginProvider; -import org.pentaho.platform.plugin.services.pluginmgr.PluginAdapter; -import org.pentaho.platform.repository2.unified.fs.FileSystemBackedUnifiedRepository; -import org.pentaho.pms.core.exception.PentahoMetadataException; -import org.pentaho.test.platform.engine.core.MicroPlatform; - -import flexjson.JSONSerializer; -import static org.pentaho.common.ui.IntegrationTestConstants.SOLUTION_PATH; - -@SuppressWarnings( { "all" } ) -public class MetadataService2IT { - - private static final String PENTAHO_XML_PATH = "/system/pentaho.xml"; //$NON-NLS-1$ - - private static final String SYSTEM_FOLDER = "/system"; //$NON-NLS-1$ - - private static final String SOLUTION = "testsolution"; //$NON-NLS-1$ - - private static MicroPlatform microPlatform = null; - private static Mockery context = new JUnit4Mockery(); - private static IUnifiedRepository repository; - - @BeforeClass - public static void initPlatform() throws Exception { - if ( microPlatform == null || !microPlatform.isInitialized() ) { - microPlatform = new MicroPlatform(SOLUTION_PATH); - microPlatform.define( ISolutionEngine.class, SolutionEngine.class ); - - repository = new FileSystemBackedUnifiedRepository(); - ( (FileSystemBackedUnifiedRepository) repository ).setRootDir( new File(SOLUTION_PATH) ); - - microPlatform.defineInstance( IUnifiedRepository.class, repository ); - - IMetadataDomainRepository domainRepository = new InMemoryMetadataDomainRepository(); - domainRepository.storeDomain( - getDomain( "steel-wheels", SOLUTION_PATH + "/steel-wheels/metadata.xmi" ), true ); - - microPlatform.defineInstance( IMetadataDomainRepository.class, domainRepository ); - microPlatform.define( IPluginManager.class, DefaultPluginManager.class, - IPentahoDefinableObjectFactory.Scope.GLOBAL ); - microPlatform.define( IPluginProvider.class, FileSystemXmlPluginProvider.class ); - - microPlatform.define( "connection-SQL", SQLConnection.class ); - microPlatform.define( IDBDatasourceService.class, JndiDatasourceService.class ); - - microPlatform.addLifecycleListener( new PluginAdapter() ); - - try { - microPlatform.start(); - } catch ( PlatformInitializationException e ) { - e.printStackTrace(); - } - } - - // JNDI - System.setProperty( "java.naming.factory.initial", "org.osjava.sj.SimpleContextFactory" ); //$NON-NLS-1$ //$NON-NLS-2$ - System.setProperty( "org.osjava.sj.root", SOLUTION_PATH + "/system/simple-jndi" ); //$NON-NLS-1$ //$NON-NLS-2$ - System.setProperty( "org.osjava.sj.delimiter", "/" ); //$NON-NLS-1$ //$NON-NLS-2$ - } - - private static final Domain getDomain( final String domainId, final String domainFile ) throws Exception { - final InputStream in = new FileInputStream( domainFile ); - final XmiParser parser = new XmiParser(); - final Domain domain = parser.parseXmi( in ); - domain.setId( domainId ); - IOUtils.closeQuietly( in ); - return domain; - } - - @Test - public void testCondition2() throws KettleException { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - KettleSystemListener.environmentInit( session ); - MetadataService2 svc = new MetadataService2(); - - Query query = new Query(); - query.setSourceId( MetadataService2.PROVIDER_ID + "~" + "steel-wheels~" + "BV_ORDERS" ); - query.setDisableDistinct( Boolean.FALSE ); - List cols = new ArrayList(); - Element col = new Element(); - col.setId( "BC_CUSTOMER_W_TER_COUNTRY" ); - col.setParentId( "BC_CUSTOMER_W_TER_" ); - col.setSelectedAggregation( "NONE" ); - cols.add( col ); - query.setElements( cols.toArray( new Element[cols.size()] ) ); - - List conditions = new ArrayList(); - Condition condition = new Condition(); - condition.setElementId( "BC_CUSTOMER_W_TER_COUNTRY" ); - condition.setParentId( "BC_CUSTOMER_W_TER_" ); - condition.setOperator( Operator.EQUAL.name() ); - condition.setValue( new String[] { "Australia" } ); - conditions.add( condition ); - query.setConditions( conditions.toArray( new Condition[conditions.size()] ) ); - - List orders = new ArrayList(); - Order order = new Order(); - order.setElementId( "BC_CUSTOMER_W_TER_COUNTRY" ); - order.setParentId( "BC_CUSTOMER_W_TER_" ); - order.setOrderType( "ASC" ); - orders.add( order ); - query.setOrders( orders.toArray( new Order[orders.size()] ) ); - - JSONSerializer serializer = new JSONSerializer(); - String json = serializer.deepSerialize( query ); - - MarshallableResultSet results = svc.doQuery( query, -1 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of column names", 1, results.getColumnNames().getColumnName().length ); - assertEquals( "wrong column name", "BC_CUSTOMER_W_TER_COUNTRY", results.getColumnNames().getColumnName()[0] ); - assertEquals( "wrong column type", "string", results.getColumnTypes().getColumnType()[0] ); - assertEquals( "wrong number of rows", 1, results.getRows().length ); - assertEquals( "wrong number of columns", 1, results.getRows()[0].getCell().length ); - assertEquals( "wrong value", "Australia", results.getRows()[0].getCell()[0] ); - - // TODO get BEGIN_WITH and other operators working - - condition.setValue( new String[] { "B" } ); - condition.setOperator( "<" ); - results = svc.doQuery( query, -1 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of column names", 1, results.getColumnNames().getColumnName().length ); - assertEquals( "wrong column name", "BC_CUSTOMER_W_TER_COUNTRY", results.getColumnNames().getColumnName()[0] ); - assertEquals( "wrong column type", "string", results.getColumnTypes().getColumnType()[0] ); - assertEquals( "wrong number of rows", 2, results.getRows().length ); - assertEquals( "wrong number of columns", 1, results.getRows()[0].getCell().length ); - assertEquals( "wrong value", "Australia", results.getRows()[0].getCell()[0] ); - assertEquals( "wrong value", "Austria", results.getRows()[1].getCell()[0] ); - - condition.setValue( new String[] { "Belgium" } ); - condition.setOperator( "<=" ); - results = svc.doQuery( query, -1 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of column names", 1, results.getColumnNames().getColumnName().length ); - assertEquals( "wrong column name", "BC_CUSTOMER_W_TER_COUNTRY", results.getColumnNames().getColumnName()[0] ); - assertEquals( "wrong column type", "string", results.getColumnTypes().getColumnType()[0] ); - assertEquals( "wrong number of rows", 3, results.getRows().length ); - assertEquals( "wrong number of columns", 1, results.getRows()[0].getCell().length ); - assertEquals( "wrong value", "Australia", results.getRows()[0].getCell()[0] ); - assertEquals( "wrong value", "Austria", results.getRows()[1].getCell()[0] ); - assertEquals( "wrong value", "Belgium", results.getRows()[2].getCell()[0] ); - - condition.setValue( new String[] { "Switzerland" } ); - condition.setOperator( ">" ); - results = svc.doQuery( query, -1 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of column names", 1, results.getColumnNames().getColumnName().length ); - assertEquals( "wrong column name", "BC_CUSTOMER_W_TER_COUNTRY", results.getColumnNames().getColumnName()[0] ); - assertEquals( "wrong column type", "string", results.getColumnTypes().getColumnType()[0] ); - assertEquals( "wrong number of rows", 2, results.getRows().length ); - assertEquals( "wrong number of columns", 1, results.getRows()[0].getCell().length ); - assertEquals( "wrong value", "UK", results.getRows()[0].getCell()[0] ); - assertEquals( "wrong value", "USA", results.getRows()[1].getCell()[0] ); - - condition.setValue( new String[] { "Switzerland" } ); - condition.setOperator( ">=" ); - results = svc.doQuery( query, -1 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of column names", 1, results.getColumnNames().getColumnName().length ); - assertEquals( "wrong column name", "BC_CUSTOMER_W_TER_COUNTRY", results.getColumnNames().getColumnName()[0] ); - assertEquals( "wrong column type", "string", results.getColumnTypes().getColumnType()[0] ); - assertEquals( "wrong number of rows", 3, results.getRows().length ); - assertEquals( "wrong number of columns", 1, results.getRows()[0].getCell().length ); - assertEquals( "wrong value", "Switzerland", results.getRows()[0].getCell()[0] ); - assertEquals( "wrong value", "UK", results.getRows()[1].getCell()[0] ); - assertEquals( "wrong value", "USA", results.getRows()[2].getCell()[0] ); - - condition.setValue( new String[] { "Switzerland" } ); - condition.setOperator( "exactly matches" ); - results = svc.doQuery( query, -1 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of column names", 1, results.getColumnNames().getColumnName().length ); - assertEquals( "wrong column name", "BC_CUSTOMER_W_TER_COUNTRY", results.getColumnNames().getColumnName()[0] ); - assertEquals( "wrong column type", "string", results.getColumnTypes().getColumnType()[0] ); - assertEquals( "wrong number of rows", 1, results.getRows().length ); - assertEquals( "wrong number of columns", 1, results.getRows()[0].getCell().length ); - assertEquals( "wrong value", "Switzerland", results.getRows()[0].getCell()[0] ); - - condition.setValue( new String[] { "Switzerland", "Austria" } ); - condition.setOperator( "exactly matches" ); - results = svc.doQuery( query, -1 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of column names", 1, results.getColumnNames().getColumnName().length ); - assertEquals( "wrong column name", "BC_CUSTOMER_W_TER_COUNTRY", results.getColumnNames().getColumnName()[0] ); - assertEquals( "wrong column type", "string", results.getColumnTypes().getColumnType()[0] ); - assertEquals( "wrong number of rows", 2, results.getRows().length ); - assertEquals( "wrong number of columns", 1, results.getRows()[0].getCell().length ); - assertEquals( "wrong value", "Austria", results.getRows()[0].getCell()[0] ); - assertEquals( "wrong value", "Switzerland", results.getRows()[1].getCell()[0] ); - - condition.setValue( new String[] { "Switzerland" } ); - condition.setOperator( "exactly matches" ); - results = svc.doQuery( query, -1 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of column names", 1, results.getColumnNames().getColumnName().length ); - assertEquals( "wrong column name", "BC_CUSTOMER_W_TER_COUNTRY", results.getColumnNames().getColumnName()[0] ); - assertEquals( "wrong column type", "string", results.getColumnTypes().getColumnType()[0] ); - assertEquals( "wrong number of rows", 1, results.getRows().length ); - assertEquals( "wrong number of columns", 1, results.getRows()[0].getCell().length ); - assertEquals( "wrong value", "Switzerland", results.getRows()[0].getCell()[0] ); - - condition.setValue( new String[] { "land" } ); - condition.setOperator( "contains" ); - results = svc.doQuery( query, -1 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of column names", 1, results.getColumnNames().getColumnName().length ); - assertEquals( "wrong column name", "BC_CUSTOMER_W_TER_COUNTRY", results.getColumnNames().getColumnName()[0] ); - assertEquals( "wrong column type", "string", results.getColumnTypes().getColumnType()[0] ); - assertEquals( "wrong number of rows", 6, results.getRows().length ); - assertEquals( "wrong number of columns", 1, results.getRows()[0].getCell().length ); - assertEquals( "wrong value", "Finland", results.getRows()[0].getCell()[0] ); - assertEquals( "wrong value", "Ireland", results.getRows()[1].getCell()[0] ); - assertEquals( "wrong value", "Netherlands", results.getRows()[2].getCell()[0] ); - assertEquals( "wrong value", "New Zealand", results.getRows()[3].getCell()[0] ); - assertEquals( "wrong value", "Poland", results.getRows()[4].getCell()[0] ); - assertEquals( "wrong value", "Switzerland", results.getRows()[5].getCell()[0] ); - - condition.setValue( new String[] { "land" } ); - condition.setOperator( "CONTAINS" ); - results = svc.doQuery( query, -1 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of column names", 1, results.getColumnNames().getColumnName().length ); - assertEquals( "wrong column name", "BC_CUSTOMER_W_TER_COUNTRY", results.getColumnNames().getColumnName()[0] ); - assertEquals( "wrong column type", "string", results.getColumnTypes().getColumnType()[0] ); - assertEquals( "wrong number of rows", 6, results.getRows().length ); - assertEquals( "wrong number of columns", 1, results.getRows()[0].getCell().length ); - assertEquals( "wrong value", "Finland", results.getRows()[0].getCell()[0] ); - assertEquals( "wrong value", "Ireland", results.getRows()[1].getCell()[0] ); - assertEquals( "wrong value", "Netherlands", results.getRows()[2].getCell()[0] ); - assertEquals( "wrong value", "New Zealand", results.getRows()[3].getCell()[0] ); - assertEquals( "wrong value", "Poland", results.getRows()[4].getCell()[0] ); - assertEquals( "wrong value", "Switzerland", results.getRows()[5].getCell()[0] ); - - condition.setValue( new String[] { "a" } ); - condition.setOperator( "does not contain" ); - results = svc.doQuery( query, -1 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of column names", 1, results.getColumnNames().getColumnName().length ); - assertEquals( "wrong column name", "BC_CUSTOMER_W_TER_COUNTRY", results.getColumnNames().getColumnName()[0] ); - assertEquals( "wrong column type", "string", results.getColumnTypes().getColumnType()[0] ); - assertEquals( "wrong number of rows", 6, results.getRows().length ); - assertEquals( "wrong number of columns", 1, results.getRows()[0].getCell().length ); - assertEquals( "wrong value", "Belgium", results.getRows()[0].getCell()[0] ); - assertEquals( "wrong value", "Hong Kong", results.getRows()[1].getCell()[0] ); - assertEquals( "wrong value", "Philippines", results.getRows()[2].getCell()[0] ); - assertEquals( "wrong value", "Sweden", results.getRows()[3].getCell()[0] ); - assertEquals( "wrong value", "UK", results.getRows()[4].getCell()[0] ); - assertEquals( "wrong value", "USA", results.getRows()[5].getCell()[0] ); - - condition.setValue( new String[] { "A" } ); - condition.setOperator( "begins with" ); - results = svc.doQuery( query, -1 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of column names", 1, results.getColumnNames().getColumnName().length ); - assertEquals( "wrong column name", "BC_CUSTOMER_W_TER_COUNTRY", results.getColumnNames().getColumnName()[0] ); - assertEquals( "wrong column type", "string", results.getColumnTypes().getColumnType()[0] ); - assertEquals( "wrong number of rows", 2, results.getRows().length ); - assertEquals( "wrong number of columns", 1, results.getRows()[0].getCell().length ); - assertEquals( "wrong value", "Australia", results.getRows()[0].getCell()[0] ); - assertEquals( "wrong value", "Austria", results.getRows()[1].getCell()[0] ); - - condition.setValue( new String[] { "A" } ); - condition.setOperator( "BEGINSWITH" ); - results = svc.doQuery( query, -1 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of column names", 1, results.getColumnNames().getColumnName().length ); - assertEquals( "wrong column name", "BC_CUSTOMER_W_TER_COUNTRY", results.getColumnNames().getColumnName()[0] ); - assertEquals( "wrong column type", "string", results.getColumnTypes().getColumnType()[0] ); - assertEquals( "wrong number of rows", 2, results.getRows().length ); - assertEquals( "wrong number of columns", 1, results.getRows()[0].getCell().length ); - assertEquals( "wrong value", "Australia", results.getRows()[0].getCell()[0] ); - assertEquals( "wrong value", "Austria", results.getRows()[1].getCell()[0] ); - - condition.setValue( new String[] { "ia" } ); - condition.setOperator( "ends with" ); - results = svc.doQuery( query, -1 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of column names", 1, results.getColumnNames().getColumnName().length ); - assertEquals( "wrong column name", "BC_CUSTOMER_W_TER_COUNTRY", results.getColumnNames().getColumnName()[0] ); - assertEquals( "wrong column type", "string", results.getColumnTypes().getColumnType()[0] ); - assertEquals( "wrong number of rows", 3, results.getRows().length ); - assertEquals( "wrong number of columns", 1, results.getRows()[0].getCell().length ); - assertEquals( "wrong value", "Australia", results.getRows()[0].getCell()[0] ); - assertEquals( "wrong value", "Austria", results.getRows()[1].getCell()[0] ); - assertEquals( "wrong value", "Russia", results.getRows()[2].getCell()[0] ); - - condition.setValue( new String[] { "ia" } ); - condition.setOperator( "ENDSWITH" ); - results = svc.doQuery( query, -1 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of column names", 1, results.getColumnNames().getColumnName().length ); - assertEquals( "wrong column name", "BC_CUSTOMER_W_TER_COUNTRY", results.getColumnNames().getColumnName()[0] ); - assertEquals( "wrong column type", "string", results.getColumnTypes().getColumnType()[0] ); - assertEquals( "wrong number of rows", 3, results.getRows().length ); - assertEquals( "wrong number of columns", 1, results.getRows()[0].getCell().length ); - assertEquals( "wrong value", "Australia", results.getRows()[0].getCell()[0] ); - assertEquals( "wrong value", "Austria", results.getRows()[1].getCell()[0] ); - assertEquals( "wrong value", "Russia", results.getRows()[2].getCell()[0] ); - - condition.setValue( new String[] { "" } ); - condition.setOperator( "is null" ); - results = svc.doQuery( query, -1 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of column names", 1, results.getColumnNames().getColumnName().length ); - assertEquals( "wrong column name", "BC_CUSTOMER_W_TER_COUNTRY", results.getColumnNames().getColumnName()[0] ); - assertEquals( "wrong column type", "string", results.getColumnTypes().getColumnType()[0] ); - assertEquals( "wrong number of rows", 0, results.getRows().length ); - - condition.setValue( new String[] { "" } ); - condition.setOperator( "ISNA" ); - results = svc.doQuery( query, -1 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of column names", 1, results.getColumnNames().getColumnName().length ); - assertEquals( "wrong column name", "BC_CUSTOMER_W_TER_COUNTRY", results.getColumnNames().getColumnName()[0] ); - assertEquals( "wrong column type", "string", results.getColumnTypes().getColumnType()[0] ); - assertEquals( "wrong number of rows", 0, results.getRows().length ); - - condition.setValue( new String[] { "" } ); - condition.setOperator( "is not null" ); - results = svc.doQuery( query, -1 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of column names", 1, results.getColumnNames().getColumnName().length ); - assertEquals( "wrong column name", "BC_CUSTOMER_W_TER_COUNTRY", results.getColumnNames().getColumnName()[0] ); - assertEquals( "wrong column type", "string", results.getColumnTypes().getColumnType()[0] ); - assertEquals( "wrong number of rows", 27, results.getRows().length ); - - condition.setValue( new String[] { "Australia" } ); - condition.setOperator( null ); - results = svc.doQuery( query, -1 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of column names", 1, results.getColumnNames().getColumnName().length ); - assertEquals( "wrong column name", "BC_CUSTOMER_W_TER_COUNTRY", results.getColumnNames().getColumnName()[0] ); - assertEquals( "wrong column type", "string", results.getColumnTypes().getColumnType()[0] ); - assertEquals( "wrong number of rows", 1, results.getRows().length ); - assertEquals( "wrong value", "Australia", results.getRows()[0].getCell()[0] ); - - condition.setValue( new String[] { "Australia" } ); - condition.setOperator( "=" ); - results = svc.doQuery( query, -1 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of column names", 1, results.getColumnNames().getColumnName().length ); - assertEquals( "wrong column name", "BC_CUSTOMER_W_TER_COUNTRY", results.getColumnNames().getColumnName()[0] ); - assertEquals( "wrong column type", "string", results.getColumnTypes().getColumnType()[0] ); - assertEquals( "wrong number of rows", 1, results.getRows().length ); - assertEquals( "wrong value", "Australia", results.getRows()[0].getCell()[0] ); - } - - @Test - public void testModelEquality() { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - MetadataService2 svc = new MetadataService2(); - - Model model = svc.getModel( MetadataService2.PROVIDER_ID + "~steel-wheels~BV_HUMAN_RESOURCES" ); - assertNotNull( "model should not be null", model ); - - assertTrue( model.equals( model ) ); - assertFalse( model.equals( null ) ); - assertFalse( model.equals( this ) ); - assertFalse( model.equals( svc.getModel( MetadataService2.PROVIDER_ID + "~steel-wheels~BV_ORDERS" ) ) ); - - Model model2 = new Model(); - Model model3 = new Model(); - - assertTrue( model2.equals( model3 ) ); - model2.setElements( new Element[] { new Element() } ); - model2.getElements()[0].setId( "id1" ); - assertFalse( model2.equals( model3 ) ); - model3.setElements( new Element[] { new Element() } ); - model2.getElements()[0].setId( "id2" ); - assertFalse( model2.equals( model3 ) ); - model2.setElements( null ); - assertFalse( model2.equals( model3 ) ); - model3.setElements( null ); - assertTrue( model2.equals( model3 ) ); - model3.setModelId( "id" ); - assertFalse( model2.equals( model3 ) ); - model2.setModelId( "not id" ); - assertFalse( model2.equals( model3 ) ); - model2.setModelId( "id" ); - assertTrue( model2.equals( model3 ) ); - model3.setName( "name" ); - assertFalse( model2.equals( model3 ) ); - model2.setName( "not name" ); - assertFalse( model2.equals( model3 ) ); - model2.setName( "name" ); - assertTrue( model2.equals( model3 ) ); - } - - @Test - public void testDomain() throws KettleException, PentahoMetadataException { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - KettleSystemListener.environmentInit( session ); - MetadataService2 svc = new MetadataService2(); - - String queryString = - "steel-wheelsBV_ORDERSfalseCAT_PRODUCTSBC_PRODUCTS_PRODUCTLINENONECAT_PRODUCTSBC_PRODUCTS_PRODUCTNAMENONECAT_PRODUCTSBC_PRODUCTS_PRODUCTCODENONECAT_ORDERSBC_ORDERDETAILS_QUANTITYORDEREDSUMCAT_ORDERSBC_ORDERDETAILS_TOTALSUMANDASCCAT_ORDERSBC_ORDERDETAILS_QUANTITYORDERED"; - - MetadataServiceUtil2 util = new MetadataServiceUtil2(); - Domain domain = util.getDomainObject( queryString ); - assertNotNull( domain ); - util.setDomain( domain ); - assertEquals( domain, util.getDomain() ); - } - - @Test - public void testQuery() throws KettleException { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - KettleSystemListener.environmentInit( session ); - MetadataService2 svc = new MetadataService2(); - - Query query = getTestQuery(); - - MarshallableResultSet results = svc.doQuery( query, -1 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of column names", 6, results.getColumnNames().getColumnName().length ); - assertEquals( "wrong column name", "BC_PRODUCTS_PRODUCTLINE", results.getColumnNames().getColumnName()[0] ); - assertEquals( "wrong column type", "string", results.getColumnTypes().getColumnType()[0] ); - assertEquals( "wrong number of rows", 82, results.getRows().length ); - assertEquals( "wrong number of columns", 6, results.getRows()[0].getCell().length ); - assertEquals( "wrong value", "Planes", results.getRows()[0].getCell()[0] ); - assertEquals( "wrong number of column header sets", 0, results.getNumColumnHeaderSets() ); - assertEquals( "wrong number of row header sets", 0, results.getNumRowHeaderSets() ); - } - - @Test - public void testQuery2() throws KettleException { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - KettleSystemListener.environmentInit( session ); - MetadataService2 svc = new MetadataService2(); - - Query query = getTestQuery(); - // remove the condition value so that the default value it used - query.getConditions()[0].setValue( new String[] { "Canada" } ); - - MarshallableResultSet results = svc.doQuery( query, -1 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of column names", 6, results.getColumnNames().getColumnName().length ); - assertEquals( "wrong column name", "BC_PRODUCTS_PRODUCTLINE", results.getColumnNames().getColumnName()[0] ); - assertEquals( "wrong column type", "string", results.getColumnTypes().getColumnType()[0] ); - assertEquals( "wrong number of rows", 48, results.getRows().length ); - assertEquals( "wrong number of columns", 6, results.getRows()[0].getCell().length ); - assertEquals( "wrong value", "Ships", results.getRows()[0].getCell()[0] ); - assertEquals( "wrong number of column header sets", 0, results.getNumColumnHeaderSets() ); - assertEquals( "wrong number of row header sets", 0, results.getNumRowHeaderSets() ); - } - - @Test - public void testQuery3() throws KettleException { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - KettleSystemListener.environmentInit( session ); - MetadataService2 svc = new MetadataService2(); - - Query query = getTestQuery(); - // Flag the condition as parameterized - query.getConditions()[0].setValue( new String[] { "BC_CUSTOMER_W_TER_COUNTRY" } ); - query.getConditions()[0].setParameterized( true ); - Parameter param = new Parameter(); - param.setDefaultValue( new String[] { "Canada" } ); - param.setElementId( "BC_CUSTOMER_W_TER_COUNTRY" ); - param.setValue( new String[] { "Germany" } ); - query.setParameters( new Parameter[] { param } ); - - MetadataServiceUtil2 util = new MetadataServiceUtil2(); - Model model = svc.getModel( query.getSourceId() ); - org.pentaho.metadata.query.model.Query fullQuery = util.convertQuery( query, model ); - QueryXmlHelper helper = new QueryXmlHelper(); - String xml = helper.toXML( fullQuery ); - MarshallableResultSet results = svc.doQuery( query, -1 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of column names", 6, results.getColumnNames().getColumnName().length ); - assertEquals( "wrong column name", "BC_PRODUCTS_PRODUCTLINE", results.getColumnNames().getColumnName()[0] ); - assertEquals( "wrong column type", "string", results.getColumnTypes().getColumnType()[0] ); - assertEquals( "wrong number of rows", 45, results.getRows().length ); - assertEquals( "wrong number of columns", 6, results.getRows()[0].getCell().length ); - assertEquals( "wrong value", "Planes", results.getRows()[0].getCell()[0] ); - assertEquals( "wrong number of column header sets", 0, results.getNumColumnHeaderSets() ); - assertEquals( "wrong number of row header sets", 0, results.getNumRowHeaderSets() ); - } - - @Test - public void testJsonQuery() throws KettleException { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - KettleSystemListener.environmentInit( session ); - MetadataService2 svc = new MetadataService2(); - - Query query = getTestQuery(); - JSONSerializer serializer = new JSONSerializer(); - String json = serializer.deepSerialize( query ); - - MarshallableResultSet results = svc.doJsonQuery( json, -1 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of column names", 6, results.getColumnNames().getColumnName().length ); - assertEquals( "wrong column name", "BC_PRODUCTS_PRODUCTLINE", results.getColumnNames().getColumnName()[0] ); - assertEquals( "wrong column type", "string", results.getColumnTypes().getColumnType()[0] ); - assertEquals( "wrong number of rows", 82, results.getRows().length ); - assertEquals( "wrong number of columns", 6, results.getRows()[0].getCell().length ); - assertEquals( "wrong value", "Planes", results.getRows()[0].getCell()[0] ); - assertEquals( "wrong number of column header sets", 0, results.getNumColumnHeaderSets() ); - assertEquals( "wrong number of row header sets", 0, results.getNumRowHeaderSets() ); - } - - private Query getTestQuery() { - Query query = new Query(); - query.setSourceId( MetadataService2.PROVIDER_ID + "~steel-wheels~BV_ORDERS" ); - query.setDisableDistinct( Boolean.FALSE ); - List cols = new ArrayList(); - Element col = new Element(); - col.setId( "BC_PRODUCTS_PRODUCTLINE" ); - col.setParentId( "CAT_PRODUCTS" ); - col.setSelectedAggregation( "NONE" ); - cols.add( col ); - col = new Element(); - col.setId( "BC_CUSTOMER_W_TER_COUNTRY" ); - col.setParentId( "BC_CUSTOMER_W_TER_" ); - col.setSelectedAggregation( "NONE" ); - cols.add( col ); - col = new Element(); - col.setId( "BC_PRODUCTS_PRODUCTNAME" ); - col.setParentId( "CAT_PRODUCTS" ); - col.setSelectedAggregation( "NONE" ); - cols.add( col ); - col = new Element(); - col.setId( "BC_PRODUCTS_PRODUCTCODE" ); - col.setParentId( "CAT_PRODUCTS" ); - col.setSelectedAggregation( "NONE" ); - cols.add( col ); - col = new Element(); - col.setId( "BC_ORDERDETAILS_QUANTITYORDERED" ); - col.setParentId( "CAT_ORDERS" ); - col.setSelectedAggregation( "SUM" ); - cols.add( col ); - col = new Element(); - col.setId( "BC_ORDERDETAILS_TOTAL" ); - col.setParentId( "CAT_ORDERS" ); - col.setSelectedAggregation( "SUM" ); - cols.add( col ); - query.setElements( cols.toArray( new Element[cols.size()] ) ); - - List conditions = new ArrayList(); - Condition condition = new Condition(); - condition.setElementId( "BC_CUSTOMER_W_TER_COUNTRY" ); - condition.setParentId( "BC_CUSTOMER_W_TER_" ); - condition.setOperator( Operator.EQUAL.name() ); - condition.setValue( new String[] { "Australia" } ); - conditions.add( condition ); - query.setConditions( conditions.toArray( new Condition[conditions.size()] ) ); - - List orders = new ArrayList(); - Order order = new Order(); - order.setElementId( "BC_ORDERDETAILS_QUANTITYORDERED" ); - order.setParentId( "CAT_ORDERS" ); - order.setOrderType( "ASC" ); - orders.add( order ); - query.setOrders( orders.toArray( new Order[orders.size()] ) ); - - return query; - } - - @Test - public void testXmlQuery1() throws KettleException { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - KettleSystemListener.environmentInit( session ); - MetadataService2 svc = new MetadataService2(); - - String queryString = - "steel-wheelsBV_ORDERSfalseCAT_PRODUCTSBC_PRODUCTS_PRODUCTLINENONECAT_PRODUCTSBC_PRODUCTS_PRODUCTNAMENONECAT_PRODUCTSBC_PRODUCTS_PRODUCTCODENONECAT_ORDERSBC_ORDERDETAILS_QUANTITYORDEREDSUMCAT_ORDERSBC_ORDERDETAILS_TOTALSUMANDASCCAT_ORDERSBC_ORDERDETAILS_QUANTITYORDERED"; - MarshallableResultSet results = svc.doXmlQuery( queryString, -1 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of column names", 5, results.getColumnNames().getColumnName().length ); - assertEquals( "wrong column name", "BC_PRODUCTS_PRODUCTLINE", results.getColumnNames().getColumnName()[0] ); - assertEquals( "wrong column type", "string", results.getColumnTypes().getColumnType()[0] ); - assertEquals( "wrong number of rows", 82, results.getRows().length ); - assertEquals( "wrong number of columns", 5, results.getRows()[0].getCell().length ); - assertEquals( "wrong value", "Planes", results.getRows()[0].getCell()[0] ); - assertEquals( "wrong number of column header sets", 0, results.getNumColumnHeaderSets() ); - assertEquals( "wrong number of row header sets", 0, results.getNumRowHeaderSets() ); - } - - @Test - public void testXmlQuery2() throws KettleException { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - KettleSystemListener.environmentInit( session ); - MetadataService2 svc = new MetadataService2(); - - String queryString = - "steel-wheelsBV_ORDERSfalseCAT_PRODUCTSBC_PRODUCTS_PRODUCTLINENONECAT_PRODUCTSBC_PRODUCTS_PRODUCTNAMENONECAT_PRODUCTSBC_PRODUCTS_PRODUCTCODENONECAT_ORDERSBC_ORDERDETAILS_QUANTITYORDEREDSUMCAT_ORDERSBC_ORDERDETAILS_TOTALSUMANDASCCAT_ORDERSBC_ORDERDETAILS_QUANTITYORDERED"; - MarshallableResultSet results = svc.doXmlQuery( queryString, 10 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of rows", 10, results.getRows().length ); - } - - @Test - public void testXmlQuery3() throws KettleException { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - KettleSystemListener.environmentInit( session ); - MetadataService2 svc = new MetadataService2(); - - String queryString = - "bogusBV_ORDERSfalseCAT_PRODUCTSBC_PRODUCTS_PRODUCTLINENONECAT_PRODUCTSBC_PRODUCTS_PRODUCTNAMENONECAT_PRODUCTSBC_PRODUCTS_PRODUCTCODENONECAT_ORDERSBC_ORDERDETAILS_QUANTITYORDEREDSUMCAT_ORDERSBC_ORDERDETAILS_TOTALSUMANDASCCAT_ORDERSBC_ORDERDETAILS_QUANTITYORDERED"; - MarshallableResultSet results = svc.doXmlQuery( queryString, 10 ); - assertNull( "results are not null", results ); - } - - @Test - public void testXmlQueryJson2() throws KettleException, JSONException { - - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - KettleSystemListener.environmentInit( session ); - MetadataService2 svc = new MetadataService2(); - - String queryString = - "bogusBV_ORDERSfalseCAT_PRODUCTSBC_PRODUCTS_PRODUCTLINENONECAT_PRODUCTSBC_PRODUCTS_PRODUCTNAMENONECAT_PRODUCTSBC_PRODUCTS_PRODUCTCODENONECAT_ORDERSBC_ORDERDETAILS_QUANTITYORDEREDSUMCAT_ORDERSBC_ORDERDETAILS_TOTALSUM"; - String json = svc.doXmlQueryToJson( queryString, -1 ); - assertNull( "results are not null", json ); - - MetadataServiceUtil2 util = new MetadataServiceUtil2(); - assertNull( "results are not null", util.createCdaJson( null, null ) ); - - } - - @Test - public void testXmlQueryToCdaJson1() throws KettleException { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - KettleSystemListener.environmentInit( session ); - MetadataService2 svc = new MetadataService2(); - - String queryString = - "steel-wheelsBV_ORDERSfalseCAT_PRODUCTSBC_PRODUCTS_PRODUCTLINENONECAT_PRODUCTSBC_PRODUCTS_PRODUCTNAMENONECAT_PRODUCTSBC_PRODUCTS_PRODUCTCODENONECAT_ORDERSBC_ORDERDETAILS_QUANTITYORDEREDSUMCAT_ORDERSBC_ORDERDETAILS_TOTALSUM"; - String json = svc.doXmlQueryToCdaJson( queryString, -1 ); - assertNotNull( "results are null", json ); - assertTrue( "wrong column name", json.indexOf( "BC_PRODUCTS_PRODUCTLINE" ) != -1 ); - assertTrue( "wrong column type", json.indexOf( "\"STRING\"" ) != -1 ); - assertTrue( "wrong value", json.indexOf( "Classic Cars" ) != -1 ); - } - - @Test - public void testXmlQueryToCdaJson2() throws KettleException { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - KettleSystemListener.environmentInit( session ); - MetadataService2 svc = new MetadataService2(); - - String queryString = - "bogusBV_ORDERSfalseCAT_PRODUCTSBC_PRODUCTS_PRODUCTLINENONECAT_PRODUCTSBC_PRODUCTS_PRODUCTNAMENONECAT_PRODUCTSBC_PRODUCTS_PRODUCTCODENONECAT_ORDERSBC_ORDERDETAILS_QUANTITYORDEREDSUMCAT_ORDERSBC_ORDERDETAILS_TOTALSUM"; - String json = svc.doXmlQueryToCdaJson( queryString, -1 ); - assertNull( "results are not null", json ); - } - - @Test - public void testJsonQueryToCdaJson1() throws KettleException { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - KettleSystemListener.environmentInit( session ); - MetadataService2 svc = new MetadataService2(); - - Query query = getTestQuery(); - JSONSerializer serializer = new JSONSerializer(); - String json = serializer.deepSerialize( query ); - - json = svc.doJsonQueryToCdaJson( json, -1 ); - - assertNotNull( "results are null", json ); - assertTrue( "wrong column name", json.indexOf( "BC_PRODUCTS_PRODUCTLINE" ) != -1 ); - assertTrue( "wrong column type", json.indexOf( "\"STRING\"" ) != -1 ); - assertTrue( "wrong value", json.indexOf( "Classic Cars" ) != -1 ); - } - - @Test - public void testGetModel1() { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - MetadataService2 svc = new MetadataService2(); - - Model model = svc.getModel( MetadataService2.PROVIDER_ID + "~steel-wheels~BV_ORDERS" ); - - assertNotNull( "model should not be null", model ); - - assertEquals( "domain id is wrong", "steel-wheels", model.getGroupId() ); - assertEquals( "model id is wrong", "BV_ORDERS", model.getModelId() ); - assertEquals( "model name is wrong", "Orders", model.getName() ); - assertEquals( "model description is wrong", "This model contains information about customers and their orders.", - model.getDescription() ); - assertTrue( "model hash is wrong", model.hashCode() != 0 ); - - Element category = model.getElements()[0]; - assertEquals( "wrong number of business columns", 38, model.getElements().length ); - assertEquals( "category id is wrong", "BC_CUSTOMER_W_TER_", category.getId() ); - assertEquals( "category name is wrong", "Customer", category.getName() ); - - Element column = model.getElements()[1]; - assertEquals( "column default agg type is wrong", "NONE", column.getDefaultAggregation().toString() ); - assertEquals( "column id is wrong", "BC_CUSTOMER_W_TER_TERRITORY", column.getId() ); - assertEquals( "column name is wrong", "Territory", column.getName() ); - assertEquals( "column selected agg type is wrong", "NONE", column.getSelectedAggregation().toString() ); - assertEquals( "column type is wrong", "STRING", column.getDataType().toString() ); - assertEquals( "field type is wrong", "DIMENSION", column.getElementType().toString() ); - assertEquals( "mask is wrong", null, column.getFormatMask() ); - assertEquals( "alignment is wrong", "LEFT", column.getHorizontalAlignment().toString() ); - assertEquals( "column agg types list is wrong size", 1, column.getAvailableAggregations().length ); - - int idx = 0; - for ( Element element : model.getElements() ) { - idx++; - } - - column = model.getElements()[21]; - assertEquals( "column id is wrong", "BC_ORDERDETAILS_QUANTITYORDERED", column.getId() ); - assertEquals( "column default agg type is wrong", "SUM", column.getDefaultAggregation().toString() ); - assertEquals( "column name is wrong", "Quantity Ordered", column.getName() ); - assertEquals( "column selected agg type is wrong", "SUM", column.getSelectedAggregation().toString() ); - assertEquals( "column type is wrong", "NUMERIC", column.getDataType().toString() ); - assertEquals( "field type is wrong", "FACT", column.getElementType().toString() ); - assertEquals( "mask is wrong", "#,###.##", column.getFormatMask() ); - assertEquals( "alignment is wrong", "RIGHT", column.getHorizontalAlignment().toString() ); - assertEquals( "column agg types list is wrong size", 4, column.getAvailableAggregations().length ); - - column = model.getElements()[23]; - assertEquals( "column default agg type is wrong", "SUM", column.getDefaultAggregation().toString() ); - assertEquals( "column id is wrong", "BC_ORDERDETAILS_TOTAL", column.getId() ); - assertEquals( "column name is wrong", "Total", column.getName() ); - assertEquals( "column selected agg type is wrong", "SUM", column.getSelectedAggregation().toString() ); - assertEquals( "column type is wrong", "NUMERIC", column.getDataType().toString() ); - assertEquals( "field type is wrong", "FACT", column.getElementType().toString() ); - assertEquals( "mask is wrong", "$#,##0.00;($#,##0.00)", column.getFormatMask() ); - assertEquals( "alignment is wrong", "RIGHT", column.getHorizontalAlignment().toString() ); - assertEquals( "column agg types list is wrong size", 4, column.getAvailableAggregations().length ); - - } - - @Test - public void testGetModel2() { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - MetadataService2 svc = new MetadataService2(); - - Model model = svc.getModel( MetadataService2.PROVIDER_ID + "~steel-wheels/bogus.xmi~BV_HUMAN_RESOURCES" ); - assertNull( "model should be null", model ); - } - - @Test - public void testGetModel3() { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - MetadataService2 svc = new MetadataService2(); - - Model model = svc.getModel( MetadataService2.PROVIDER_ID + "~steel-wheels~" ); - assertNull( "model should be null", model ); - } - - @Test - public void testGetModel4() { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - MetadataService2 svc = new MetadataService2(); - - Model model = svc.getModel( MetadataService2.PROVIDER_ID + "~bogus~BV_ORDERS" ); - assertNull( "model should be null", model ); - } - - @Test - public void testGetModel5() { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - MetadataService2 svc = new MetadataService2(); - - Model model = svc.getModel( MetadataService2.PROVIDER_ID + "~steel-wheels~bogus" ); - assertNull( "model should be null", model ); - } - - @Test - public void testListBusinessModels1() throws IOException { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - MetadataService2 svc = new MetadataService2(); - - ModelInfo[] models = svc.getModelList( MetadataService2.PROVIDER_ID, "steel-wheels", null ); - assertNotNull( models ); - assertTrue( "Wrong nuber of models returned", models.length > 2 ); - boolean found = false; - for ( int idx = 0; idx < models.length; idx++ ) { - if ( models[idx].getGroupId().equals( "steel-wheels" ) && models[idx].getModelId().equals( "BV_HUMAN_RESOURCES" ) ) { - assertEquals( "Wrong domain id", "steel-wheels", models[idx].getGroupId() ); - assertEquals( "Wrong description", "This model contains information about Employees.", models[idx] - .getDescription() ); - assertEquals( "Wrong model id", "BV_HUMAN_RESOURCES", models[idx].getModelId() ); - assertEquals( "Wrong model name", "Human Resources", models[idx].getName() ); - found = true; - } - } - assertTrue( "model was not found", found ); - } - - @Test - public void testListBusinessModels2() throws IOException { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - MetadataService2 svc = new MetadataService2(); - - ModelInfo[] models = svc.getModelList( MetadataService2.PROVIDER_ID, "steel-wheels", null ); - assertNotNull( models ); - assertEquals( "Wrong nuber of models returned", 3, models.length ); - } - - @Test - public void testListBusinessModels3() throws IOException { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - MetadataService2 svc = new MetadataService2(); - - ModelInfo[] models = svc.getModelList( "bogus", null, null ); - assertNotNull( models ); - assertEquals( "Wrong nuber of models returned", 0, models.length ); - } - - @Test - public void testListBusinessModels4() throws IOException { - // without a session we should not get any models back - PentahoSessionHolder.removeSession(); - - MetadataService2 svc = new MetadataService2(); - - ModelInfo[] models = svc.getModelList( MetadataService2.PROVIDER_ID, "bogus", null ); - assertNotNull( models ); - assertEquals( "Wrong nuber of models returned", 0, models.length ); - } - - @Test - public void testParameter() { - Parameter param = new Parameter(); - - param.setDefaultValue( new String[] { "default" } ); - assertEquals( "default", param.getValue()[0] ); - assertEquals( "default", param.getDefaultValue()[0] ); - - param.setValue( new String[] { "value" } ); - assertEquals( "value", param.getValue()[0] ); - assertEquals( "default", param.getDefaultValue()[0] ); - - param.setType( "String" ); - assertEquals( "String", param.getType() ); - - param.setName( "myparam" ); - assertEquals( "myparam", param.getName() ); - } - - @Test - public void testCondition1() { - Condition condition = new Condition(); - condition.setElementId( "column" ); - condition.setParentId( "cat" ); - condition.setCombinationType( CombinationType.AND.name() ); - condition.setOperator( Operator.EQUAL.name() ); - condition.setValue( new String[] { "bingo" } ); - condition.setParameterized( true ); - - String str = condition.getCondition( DataType.STRING.getName() ); - assertEquals( "[cat.column] = [param:bingo]", str ); - - condition.setValue( new String[] { "bingo" } ); - str = condition.getCondition( DataType.STRING.getName(), condition.getElementId() ); - assertEquals( "[cat.column] = [param:column]", str ); - - condition.setValue( new String[] { "bingo" } ); - str = condition.getCondition( DataType.DATE.getName(), condition.getElementId() ); - assertEquals( "[cat.column] =DATEVALUE([param:bingo])", str ); - - condition.setValue( new String[] { "bingo" } ); - str = condition.getCondition( DataType.STRING.getName(), null ); - assertEquals( "[cat.column] = \"bingo\"", str ); - - condition.setValue( new String[] { "bingo" } ); - str = condition.getCondition( DataType.DATE.getName(), null ); - assertEquals( "[cat.column] =DATEVALUE(\"bingo\")", str ); - - str = condition.getCondition( DataType.STRING.getName(), "myparam" ); - assertEquals( "[cat.column] = [param:myparam]", str ); - } - - @Test - public void testCondition_aggregate() { - Condition c = new Condition(); - c.setElementId( "column" ); - c.setParentId( "cat" ); - c.setCombinationType( CombinationType.OR.name() ); - c.setValue( new String[] { "testing" } ); - - String str = c.getCondition( DataType.STRING.getName(), null ); - assertEquals( "[cat.column] = \"testing\"", str ); - - c.setSelectedAggregation( AggregationType.MINIMUM.name() ); - c.setValue( new String[] { "testing" } ); - str = c.getCondition( DataType.STRING.getName(), null ); - assertEquals( "[cat.column.MINIMUM] = \"testing\"", str ); - } - -} diff --git a/impl/server/src/it/java/org/pentaho/common/ui/metadata/service/MetadataServiceIT.java b/impl/server/src/it/java/org/pentaho/common/ui/metadata/service/MetadataServiceIT.java deleted file mode 100644 index 161c86b47b..0000000000 --- a/impl/server/src/it/java/org/pentaho/common/ui/metadata/service/MetadataServiceIT.java +++ /dev/null @@ -1,749 +0,0 @@ -/*! - * This program is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License, version 2.1 as published by the Free Software - * Foundation. - * - * You should have received a copy of the GNU Lesser General Public License along with this - * program; if not, you can obtain a copy at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html - * or from the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU Lesser General Public License for more details. - * - * Copyright (c) 2002-2017 Hitachi Vantara.. All rights reserved. - */ - -package org.pentaho.common.ui.metadata.service; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.io.IOUtils; -import org.jmock.Mockery; -import org.jmock.integration.junit4.JUnit4Mockery; -import org.json.JSONException; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; -import org.pentaho.common.ui.metadata.model.IColumn; -import org.pentaho.common.ui.metadata.model.Operator; -import org.pentaho.common.ui.metadata.model.impl.Category; -import org.pentaho.common.ui.metadata.model.impl.Column; -import org.pentaho.common.ui.metadata.model.impl.Condition; -import org.pentaho.common.ui.metadata.model.impl.Model; -import org.pentaho.common.ui.metadata.model.impl.ModelInfo; -import org.pentaho.common.ui.metadata.model.impl.Order; -import org.pentaho.common.ui.metadata.model.impl.Parameter; -import org.pentaho.common.ui.metadata.model.impl.Query; -import org.pentaho.commons.connection.marshal.MarshallableResultSet; -import org.pentaho.di.core.exception.KettleException; -import org.pentaho.metadata.model.Domain; -import org.pentaho.metadata.model.concept.types.AggregationType; -import org.pentaho.metadata.model.concept.types.DataType; -import org.pentaho.metadata.query.model.CombinationType; -import org.pentaho.metadata.query.model.util.QueryXmlHelper; -import org.pentaho.metadata.repository.IMetadataDomainRepository; -import org.pentaho.metadata.repository.InMemoryMetadataDomainRepository; -import org.pentaho.metadata.util.XmiParser; -import org.pentaho.platform.api.data.IDBDatasourceService; -import org.pentaho.platform.api.engine.IPentahoDefinableObjectFactory; -import org.pentaho.platform.api.engine.IPluginManager; -import org.pentaho.platform.api.engine.IPluginProvider; -import org.pentaho.platform.api.engine.ISolutionEngine; -import org.pentaho.platform.api.repository2.unified.IUnifiedRepository; -import org.pentaho.platform.engine.core.system.PentahoSessionHolder; -import org.pentaho.platform.engine.core.system.StandaloneSession; -import org.pentaho.platform.engine.core.system.boot.PlatformInitializationException; -import org.pentaho.platform.engine.services.connection.datasource.dbcp.JndiDatasourceService; -import org.pentaho.platform.engine.services.solution.SolutionEngine; -import org.pentaho.platform.plugin.action.kettle.KettleSystemListener; -import org.pentaho.platform.plugin.services.connections.sql.SQLConnection; -import org.pentaho.platform.plugin.services.pluginmgr.DefaultPluginManager; -import org.pentaho.platform.plugin.services.pluginmgr.FileSystemXmlPluginProvider; -import org.pentaho.platform.plugin.services.pluginmgr.PluginAdapter; -import org.pentaho.platform.repository2.unified.fs.FileSystemBackedUnifiedRepository; -import org.pentaho.pms.core.exception.PentahoMetadataException; -import org.pentaho.test.platform.engine.core.MicroPlatform; - -import flexjson.JSONDeserializer; -import flexjson.JSONSerializer; - -import static org.pentaho.common.ui.IntegrationTestConstants.SOLUTION_PATH; - -@SuppressWarnings( { "all" } ) -public class MetadataServiceIT { - - private static final String PENTAHO_XML_PATH = "/system/pentaho.xml"; //$NON-NLS-1$ - - private static final String SYSTEM_FOLDER = "/system"; //$NON-NLS-1$ - - private static final String SOLUTION = "testsolution"; //$NON-NLS-1$ - - private static MicroPlatform microPlatform = null; - private static Mockery context = new JUnit4Mockery(); - private static IUnifiedRepository repository; - - @BeforeClass - public static void initPlatform() throws Exception { - - if ( microPlatform == null || !microPlatform.isInitialized() ) { - microPlatform = new MicroPlatform(SOLUTION_PATH); - microPlatform.define( ISolutionEngine.class, SolutionEngine.class ); - - repository = new FileSystemBackedUnifiedRepository(); - ( (FileSystemBackedUnifiedRepository) repository ).setRootDir( new File(SOLUTION_PATH) ); - - microPlatform.defineInstance( IUnifiedRepository.class, repository ); - - IMetadataDomainRepository domainRepository = new InMemoryMetadataDomainRepository(); - domainRepository.storeDomain( - getDomain( "steel-wheels", SOLUTION_PATH + "/steel-wheels/metadata.xmi" ), true ); - - microPlatform.defineInstance( IMetadataDomainRepository.class, domainRepository ); - microPlatform.define( IPluginManager.class, DefaultPluginManager.class, - IPentahoDefinableObjectFactory.Scope.GLOBAL ); - microPlatform.define( IPluginProvider.class, FileSystemXmlPluginProvider.class ); - - microPlatform.define( "connection-SQL", SQLConnection.class ); - microPlatform.define( IDBDatasourceService.class, JndiDatasourceService.class ); - - microPlatform.addLifecycleListener( new PluginAdapter() ); - - try { - microPlatform.start(); - } catch ( PlatformInitializationException e ) { - e.printStackTrace(); - } - } - - // JNDI - System.setProperty( "java.naming.factory.initial", "org.osjava.sj.SimpleContextFactory" ); //$NON-NLS-1$ //$NON-NLS-2$ - System.setProperty( "org.osjava.sj.root", SOLUTION_PATH + "/system/simple-jndi" ); //$NON-NLS-1$ //$NON-NLS-2$ - System.setProperty( "org.osjava.sj.delimiter", "/" ); //$NON-NLS-1$ //$NON-NLS-2$ - } - - private static final Domain getDomain( final String domainId, final String domainFile ) throws Exception { - final InputStream in = new FileInputStream( domainFile ); - final XmiParser parser = new XmiParser(); - final Domain domain = parser.parseXmi( in ); - domain.setId( domainId ); - IOUtils.closeQuietly( in ); - return domain; - } - - @Test - public void testModelEquality() { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - MetadataService svc = new MetadataService(); - - Model model = svc.loadModel( "steel-wheels", "BV_HUMAN_RESOURCES" ); - assertNotNull( "model should not be null", model ); - - assertTrue( model.equals( model ) ); - assertFalse( model.equals( null ) ); - assertFalse( model.equals( this ) ); - assertFalse( model.equals( svc.loadModel( "steel-wheels", "BV_ORDERS" ) ) ); - - Model model2 = new Model(); - Model model3 = new Model(); - - assertTrue( model2.equals( model3 ) ); - model2.setCategories( new Category[] { new Category() } ); - assertFalse( model2.equals( model3 ) ); - model3.setCategories( new Category[] { new Category() } ); - assertFalse( model2.equals( model3 ) ); - model2.setCategories( null ); - assertFalse( model2.equals( model3 ) ); - model3.setCategories( null ); - assertTrue( model2.equals( model3 ) ); - model3.setId( "id" ); - assertFalse( model2.equals( model3 ) ); - model2.setId( "not id" ); - assertFalse( model2.equals( model3 ) ); - model2.setId( "id" ); - assertTrue( model2.equals( model3 ) ); - model3.setName( "name" ); - assertFalse( model2.equals( model3 ) ); - model2.setName( "not name" ); - assertFalse( model2.equals( model3 ) ); - model2.setName( "name" ); - assertTrue( model2.equals( model3 ) ); - - } - - @Test - public void testDomain() throws KettleException, PentahoMetadataException { - - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - KettleSystemListener.environmentInit( session ); - MetadataService svc = new MetadataService(); - - String queryString = - "steel-wheelsBV_ORDERSfalseCAT_PRODUCTSBC_PRODUCTS_PRODUCTLINENONECAT_PRODUCTSBC_PRODUCTS_PRODUCTNAMENONECAT_PRODUCTSBC_PRODUCTS_PRODUCTCODENONECAT_ORDERSBC_ORDERDETAILS_QUANTITYORDEREDSUMCAT_ORDERSBC_ORDERDETAILS_TOTALSUMANDASCCAT_ORDERSBC_ORDERDETAILS_QUANTITYORDERED"; - - MetadataServiceUtil util = new MetadataServiceUtil(); - Domain domain = util.getDomainObject( queryString ); - assertNotNull( domain ); - util.setDomain( domain ); - assertEquals( domain, util.getDomain() ); - } - - @Test - public void testQuery() throws KettleException { - - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - KettleSystemListener.environmentInit( session ); - MetadataService svc = new MetadataService(); - - Query query = getTestQuery(); - - MarshallableResultSet results = svc.doQuery( query, -1 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of column names", 6, results.getColumnNames().getColumnName().length ); - assertEquals( "wrong column name", "BC_PRODUCTS_PRODUCTLINE", results.getColumnNames().getColumnName()[0] ); - assertEquals( "wrong column type", "string", results.getColumnTypes().getColumnType()[0] ); - assertEquals( "wrong number of rows", 82, results.getRows().length ); - assertEquals( "wrong number of columns", 6, results.getRows()[0].getCell().length ); - assertEquals( "wrong value", "Planes", results.getRows()[0].getCell()[0] ); - assertEquals( "wrong number of column header sets", 0, results.getNumColumnHeaderSets() ); - assertEquals( "wrong number of row header sets", 0, results.getNumRowHeaderSets() ); - - } - - @Test - public void testQuery2() throws KettleException { - - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - KettleSystemListener.environmentInit( session ); - MetadataService svc = new MetadataService(); - - Query query = getTestQuery(); - // remove the condition value so that the default value it used - query.getConditions()[0].setValue( new String[] { "Canada" } ); - - MarshallableResultSet results = svc.doQuery( query, -1 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of column names", 6, results.getColumnNames().getColumnName().length ); - assertEquals( "wrong column name", "BC_PRODUCTS_PRODUCTLINE", results.getColumnNames().getColumnName()[0] ); - assertEquals( "wrong column type", "string", results.getColumnTypes().getColumnType()[0] ); - assertEquals( "wrong number of rows", 48, results.getRows().length ); - assertEquals( "wrong number of columns", 6, results.getRows()[0].getCell().length ); - assertEquals( "wrong value", "Ships", results.getRows()[0].getCell()[0] ); - assertEquals( "wrong number of column header sets", 0, results.getNumColumnHeaderSets() ); - assertEquals( "wrong number of row header sets", 0, results.getNumRowHeaderSets() ); - - } - - @Test - public void testQuery3() throws KettleException { - - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - KettleSystemListener.environmentInit( session ); - MetadataService svc = new MetadataService(); - - Query query = getTestQuery(); - // Flag the condition as parameterized - query.getConditions()[0].setValue( new String[] { "BC_CUSTOMER_W_TER_COUNTRY" } ); - query.getConditions()[0].setParameterized( true ); - Parameter param = new Parameter(); - param.setDefaultValue( new String[] { "Canada" } ); - param.setColumn( "BC_CUSTOMER_W_TER_COUNTRY" ); - param.setValue( new String[] { "Germany" } ); - query.setParameters( new Parameter[] { param } ); - - MetadataServiceUtil util = new MetadataServiceUtil(); - org.pentaho.metadata.query.model.Query fullQuery = util.convertQuery( query ); - QueryXmlHelper helper = new QueryXmlHelper(); - String xml = helper.toXML( fullQuery ); - // System.out.println(xml); - MarshallableResultSet results = svc.doQuery( query, -1 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of column names", 6, results.getColumnNames().getColumnName().length ); - assertEquals( "wrong column name", "BC_PRODUCTS_PRODUCTLINE", results.getColumnNames().getColumnName()[0] ); - assertEquals( "wrong column type", "string", results.getColumnTypes().getColumnType()[0] ); - assertEquals( "wrong number of rows", 45, results.getRows().length ); - assertEquals( "wrong number of columns", 6, results.getRows()[0].getCell().length ); - assertEquals( "wrong value", "Planes", results.getRows()[0].getCell()[0] ); - assertEquals( "wrong number of column header sets", 0, results.getNumColumnHeaderSets() ); - assertEquals( "wrong number of row header sets", 0, results.getNumRowHeaderSets() ); - - } - - private Query getTestQuery() { - Query query = new Query(); - query.setDomainName( "steel-wheels" ); - query.setModelId( "BV_ORDERS" ); - query.setDisableDistinct( Boolean.FALSE ); - List cols = new ArrayList(); - Column col = new Column(); - col.setId( "BC_PRODUCTS_PRODUCTLINE" ); - col.setCategory( "CAT_PRODUCTS" ); - col.setSelectedAggType( "NONE" ); - cols.add( col ); - col = new Column(); - col.setId( "BC_CUSTOMER_W_TER_COUNTRY" ); - col.setCategory( "BC_CUSTOMER_W_TER_" ); - col.setSelectedAggType( "NONE" ); - cols.add( col ); - col = new Column(); - col.setId( "BC_PRODUCTS_PRODUCTNAME" ); - col.setCategory( "CAT_PRODUCTS" ); - col.setSelectedAggType( "NONE" ); - cols.add( col ); - col = new Column(); - col.setId( "BC_PRODUCTS_PRODUCTCODE" ); - col.setCategory( "CAT_PRODUCTS" ); - col.setSelectedAggType( "NONE" ); - cols.add( col ); - col = new Column(); - col.setId( "BC_ORDERDETAILS_QUANTITYORDERED" ); - col.setCategory( "CAT_ORDERS" ); - col.setSelectedAggType( "SUM" ); - cols.add( col ); - col = new Column(); - col.setId( "BC_ORDERDETAILS_TOTAL" ); - col.setCategory( "CAT_ORDERS" ); - col.setSelectedAggType( "SUM" ); - cols.add( col ); - query.setColumns( cols.toArray( new Column[cols.size()] ) ); - - List conditions = new ArrayList(); - Condition condition = new Condition(); - condition.setColumn( "BC_CUSTOMER_W_TER_COUNTRY" ); - condition.setCategory( "BC_CUSTOMER_W_TER_" ); - condition.setOperator( Operator.EQUAL.name() ); - condition.setValue( new String[] { "Australia" } ); - conditions.add( condition ); - query.setConditions( conditions.toArray( new Condition[conditions.size()] ) ); - - List orders = new ArrayList(); - Order order = new Order(); - order.setColumn( "BC_ORDERDETAILS_QUANTITYORDERED" ); - order.setCategory( "CAT_ORDERS" ); - order.setOrderType( "ASC" ); - orders.add( order ); - query.setOrders( orders.toArray( new Order[orders.size()] ) ); - - return query; - } - - @Test - public void testXmlQuery1() throws KettleException { - - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - KettleSystemListener.environmentInit( session ); - MetadataService svc = new MetadataService(); - - String queryString = - "steel-wheelsBV_ORDERSfalseCAT_PRODUCTSBC_PRODUCTS_PRODUCTLINENONECAT_PRODUCTSBC_PRODUCTS_PRODUCTNAMENONECAT_PRODUCTSBC_PRODUCTS_PRODUCTCODENONECAT_ORDERSBC_ORDERDETAILS_QUANTITYORDEREDSUMCAT_ORDERSBC_ORDERDETAILS_TOTALSUMANDASCCAT_ORDERSBC_ORDERDETAILS_QUANTITYORDERED"; - MarshallableResultSet results = svc.doXmlQuery( queryString, -1 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of column names", 5, results.getColumnNames().getColumnName().length ); - assertEquals( "wrong column name", "BC_PRODUCTS_PRODUCTLINE", results.getColumnNames().getColumnName()[0] ); - assertEquals( "wrong column type", "string", results.getColumnTypes().getColumnType()[0] ); - assertEquals( "wrong number of rows", 82, results.getRows().length ); - assertEquals( "wrong number of columns", 5, results.getRows()[0].getCell().length ); - assertEquals( "wrong value", "Planes", results.getRows()[0].getCell()[0] ); - assertEquals( "wrong number of column header sets", 0, results.getNumColumnHeaderSets() ); - assertEquals( "wrong number of row header sets", 0, results.getNumRowHeaderSets() ); - - } - - @Test - public void testXmlQuery2() throws KettleException { - - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - KettleSystemListener.environmentInit( session ); - MetadataService svc = new MetadataService(); - - String queryString = - "steel-wheelsBV_ORDERSfalseCAT_PRODUCTSBC_PRODUCTS_PRODUCTLINENONECAT_PRODUCTSBC_PRODUCTS_PRODUCTNAMENONECAT_PRODUCTSBC_PRODUCTS_PRODUCTCODENONECAT_ORDERSBC_ORDERDETAILS_QUANTITYORDEREDSUMCAT_ORDERSBC_ORDERDETAILS_TOTALSUMANDASCCAT_ORDERSBC_ORDERDETAILS_QUANTITYORDERED"; - MarshallableResultSet results = svc.doXmlQuery( queryString, 10 ); - assertNotNull( "results are null", results ); - assertEquals( "wrong number of rows", 10, results.getRows().length ); - } - - @Test - public void testXmlQuery3() throws KettleException { - - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - KettleSystemListener.environmentInit( session ); - MetadataService svc = new MetadataService(); - - String queryString = - "bogusBV_ORDERSfalseCAT_PRODUCTSBC_PRODUCTS_PRODUCTLINENONECAT_PRODUCTSBC_PRODUCTS_PRODUCTNAMENONECAT_PRODUCTSBC_PRODUCTS_PRODUCTCODENONECAT_ORDERSBC_ORDERDETAILS_QUANTITYORDEREDSUMCAT_ORDERSBC_ORDERDETAILS_TOTALSUMANDASCCAT_ORDERSBC_ORDERDETAILS_QUANTITYORDERED"; - MarshallableResultSet results = svc.doXmlQuery( queryString, 10 ); - assertNull( "results are not null", results ); - } - - public void testJsonQueryToJson2() throws KettleException { - - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - KettleSystemListener.environmentInit( session ); - MetadataService svc = new MetadataService(); - - String json = - "{\"class\":\"org.pentaho.common.ui.metadata.model.impl.Query\",\"columns\":[{\"aggTypes\":[],\"category\":\"BC_CUSTOMER_W_TER_\",\"class\":\"org.pentaho.common.ui.metadata.model.impl.Column\",\"defaultAggType\":null,\"fieldType\":null,\"id\":\"BC_CUSTOMER_W_TER_COUNTRY\",\"name\":null,\"selectedAggType\":\"NONE\",\"type\":null}],\"conditions\":[{\"category\":\"BC_CUSTOMER_W_TER_\",\"class\":\"org.pentaho.common.ui.metadata.model.impl.Condition\",\"column\":\"BC_CUSTOMER_W_TER_COUNTRY\",\"combinationType\":\"AND\",\"operator\":\"EQUAL\",\"value\":[\"Australia\"]}],\"defaultParameterMap\":null,\"disableDistinct\":false,\"domainName\":\"steel-wheels\",\"modelId\":\"BV_ORDERS\",\"orders\":[{\"category\":\"BC_CUSTOMER_W_TER_\",\"class\":\"org.pentaho.common.ui.metadata.model.impl.Order\",\"column\":\"BC_CUSTOMER_W_TER_COUNTRY\",\"orderType\":\"ASC\"}],\"parameters\":[]}"; - json = svc.doJsonQueryToJson( json, -1 ); - - assertNotNull( "results are null", json ); - // System.out.println(json); - assertTrue( "wrong column name", json.indexOf( "BC_CUSTOMER_W_TER_COUNTRY" ) != -1 ); - assertTrue( "wrong column type", json.indexOf( "\"string\"" ) != -1 ); - assertTrue( "wrong value", json.indexOf( "Australia" ) != -1 ); - } - - @Test - public void testXmlQueryJson2() throws KettleException, JSONException { - - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - KettleSystemListener.environmentInit( session ); - MetadataService svc = new MetadataService(); - - String queryString = - "bogusBV_ORDERSfalseCAT_PRODUCTSBC_PRODUCTS_PRODUCTLINENONECAT_PRODUCTSBC_PRODUCTS_PRODUCTNAMENONECAT_PRODUCTSBC_PRODUCTS_PRODUCTCODENONECAT_ORDERSBC_ORDERDETAILS_QUANTITYORDEREDSUMCAT_ORDERSBC_ORDERDETAILS_TOTALSUM"; - String json = svc.doXmlQueryToJson( queryString, -1 ); - assertNull( "results are not null", json ); - - MetadataServiceUtil util = new MetadataServiceUtil(); - assertNull( "results are not null", util.createCdaJson( null, null ) ); - - } - - @Test - public void testXmlQueryToCdaJson1() throws KettleException { - - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - KettleSystemListener.environmentInit( session ); - MetadataService svc = new MetadataService(); - - String queryString = - "steel-wheelsBV_ORDERSfalseCAT_PRODUCTSBC_PRODUCTS_PRODUCTLINENONECAT_PRODUCTSBC_PRODUCTS_PRODUCTNAMENONECAT_PRODUCTSBC_PRODUCTS_PRODUCTCODENONECAT_ORDERSBC_ORDERDETAILS_QUANTITYORDEREDSUMCAT_ORDERSBC_ORDERDETAILS_TOTALSUM"; - String json = svc.doXmlQueryToCdaJson( queryString, -1 ); - assertNotNull( "results are null", json ); - System.out.println( json ); - assertTrue( "wrong column name", json.indexOf( "BC_PRODUCTS_PRODUCTLINE" ) != -1 ); - assertTrue( "wrong column type", json.indexOf( "\"STRING\"" ) != -1 ); - assertTrue( "wrong value", json.indexOf( "Classic Cars" ) != -1 ); - } - - @Test - public void testXmlQueryToCdaJson2() throws KettleException { - - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - KettleSystemListener.environmentInit( session ); - MetadataService svc = new MetadataService(); - - String queryString = - "bogusBV_ORDERSfalseCAT_PRODUCTSBC_PRODUCTS_PRODUCTLINENONECAT_PRODUCTSBC_PRODUCTS_PRODUCTNAMENONECAT_PRODUCTSBC_PRODUCTS_PRODUCTCODENONECAT_ORDERSBC_ORDERDETAILS_QUANTITYORDEREDSUMCAT_ORDERSBC_ORDERDETAILS_TOTALSUM"; - String json = svc.doXmlQueryToCdaJson( queryString, -1 ); - assertNull( "results are not null", json ); - } - - @Test - public void testGetModel1() { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - MetadataService svc = new MetadataService(); - - Model model = svc.loadModel( "steel-wheels", "BV_ORDERS" ); - assertNotNull( "model should not be null", model ); - - assertEquals( "domain id is wrong", "steel-wheels", model.getDomainId() ); - assertEquals( "model id is wrong", "BV_ORDERS", model.getId() ); - assertEquals( "model name is wrong", "Orders", model.getName() ); - assertEquals( "model description is wrong", "This model contains information about customers and their orders.", - model.getDescription() ); - assertTrue( "model hash is wrong", model.hashCode() != 0 ); - - assertEquals( "wrong number of categories", 4, model.getCategories().length ); - - Category category = model.getCategories()[0]; - assertEquals( "wrong number of business columns", 13, category.getColumns().length ); - assertEquals( "category id is wrong", "BC_CUSTOMER_W_TER_", category.getId() ); - assertEquals( "category name is wrong", "Customer", category.getName() ); - - IColumn column = category.getColumns()[0]; - assertEquals( "column default agg type is wrong", "NONE", column.getDefaultAggType().toString() ); - assertEquals( "column id is wrong", "BC_CUSTOMER_W_TER_TERRITORY", column.getId() ); - assertEquals( "column name is wrong", "Territory", column.getName() ); - assertEquals( "column selected agg type is wrong", "NONE", column.getSelectedAggType().toString() ); - assertEquals( "column type is wrong", "STRING", column.getType().toString() ); - assertEquals( "field type is wrong", "DIMENSION", column.getFieldType().toString() ); - assertEquals( "mask is wrong", null, column.getFormatMask() ); - assertEquals( "alignment is wrong", "LEFT", column.getHorizontalAlignment().toString() ); - assertEquals( "column agg types list is wrong size", 1, column.getAggTypes().length ); - - category = model.getCategories()[1]; - assertEquals( "wrong number of business columns", 9, category.getColumns().length ); - assertEquals( "category id is wrong", "CAT_ORDERS", category.getId() ); - assertEquals( "category name is wrong", "Orders", category.getName() ); - - column = category.getColumns()[6]; - assertEquals( "column default agg type is wrong", "SUM", column.getDefaultAggType().toString() ); - assertEquals( "column id is wrong", "BC_ORDERDETAILS_QUANTITYORDERED", column.getId() ); - assertEquals( "column name is wrong", "Quantity Ordered", column.getName() ); - assertEquals( "column selected agg type is wrong", "SUM", column.getSelectedAggType().toString() ); - assertEquals( "column type is wrong", "NUMERIC", column.getType().toString() ); - assertEquals( "field type is wrong", "FACT", column.getFieldType().toString() ); - assertEquals( "mask is wrong", "#,###.##", column.getFormatMask() ); - assertEquals( "alignment is wrong", "RIGHT", column.getHorizontalAlignment().toString() ); - assertEquals( "column agg types list is wrong size", 4, column.getAggTypes().length ); - - column = category.getColumns()[8]; - assertEquals( "column default agg type is wrong", "SUM", column.getDefaultAggType().toString() ); - assertEquals( "column id is wrong", "BC_ORDERDETAILS_TOTAL", column.getId() ); - assertEquals( "column name is wrong", "Total", column.getName() ); - assertEquals( "column selected agg type is wrong", "SUM", column.getSelectedAggType().toString() ); - assertEquals( "column type is wrong", "NUMERIC", column.getType().toString() ); - assertEquals( "field type is wrong", "FACT", column.getFieldType().toString() ); - assertEquals( "mask is wrong", "$#,##0.00;($#,##0.00)", column.getFormatMask() ); - assertEquals( "alignment is wrong", "RIGHT", column.getHorizontalAlignment().toString() ); - assertEquals( "column agg types list is wrong size", 4, column.getAggTypes().length ); - - } - - @Test - public void testGetModel2() { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - MetadataService svc = new MetadataService(); - - Model model = svc.loadModel( null, "BV_HUMAN_RESOURCES" ); - assertNull( "model should be null", model ); - } - - @Test - public void testGetModel3() { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - MetadataService svc = new MetadataService(); - - Model model = svc.loadModel( "steel-wheels", null ); - assertNull( "model should be null", model ); - } - - @Test - public void testGetModel4() { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - MetadataService svc = new MetadataService(); - - Model model = svc.loadModel( "bogud", "BV_HUMAN_RESOURCES" ); - assertNull( "model should be null", model ); - } - - @Test - public void testGetModel5() { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - MetadataService svc = new MetadataService(); - - Model model = svc.loadModel( "steel-wheels", "bogus" ); - assertNull( "model should be null", model ); - } - - @Test - public void testListBusinessModels1() throws IOException { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - MetadataService svc = new MetadataService(); - - ModelInfo[] models = svc.listBusinessModels( null, null ); - assertNotNull( models ); - assertTrue( "Wrong nuber of models returned", models.length > 2 ); - boolean found = false; - for ( int idx = 0; idx < models.length; idx++ ) { - if ( models[idx].getDomainId().equals( "steel-wheels" ) && models[idx].getModelId().equals( "BV_HUMAN_RESOURCES" ) ) { - assertEquals( "Wrong domain id", "steel-wheels", models[idx].getDomainId() ); - assertEquals( "Wrong description", "This model contains information about Employees.", models[idx] - .getModelDescription() ); - assertEquals( "Wrong model id", "BV_HUMAN_RESOURCES", models[idx].getModelId() ); - assertEquals( "Wrong model name", "Human Resources", models[idx].getModelName() ); - found = true; - } - } - assertTrue( "model was not found", found ); - } - - @Test - public void testListBusinessModels2() throws IOException { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - MetadataService svc = new MetadataService(); - - ModelInfo[] models = svc.listBusinessModels( "steel-wheels", null ); - assertNotNull( models ); - assertEquals( "Wrong nuber of models returned", 3, models.length ); - } - - @Test - public void testListBusinessModels3() throws IOException { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - MetadataService svc = new MetadataService(); - - ModelInfo[] models = svc.listBusinessModels( "bogus", null ); - assertNotNull( models ); - assertEquals( "Wrong nuber of models returned", 0, models.length ); - } - - @Test - public void testListBusinessModels4() throws IOException { - // without a session we should not get any models back - PentahoSessionHolder.removeSession(); - - MetadataService svc = new MetadataService(); - - ModelInfo[] models = svc.listBusinessModels( "bogus", null ); - assertNotNull( models ); - assertEquals( "Wrong nuber of models returned", 0, models.length ); - } - - @Test - public void testListBusinessModelsJson() throws IOException { - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - MetadataService svc = new MetadataService(); - - String json = svc.listBusinessModelsJson( null, null ); - assertNotNull( json ); - // System.out.println(json); - // convert to a list - Object result = new JSONDeserializer().deserialize( json ); - List modelList = new JSONDeserializer>().deserialize( json ); - - ModelInfo[] models = modelList.toArray( new ModelInfo[modelList.size()] ); - - assertNotNull( models ); - assertTrue( "Wrong nuber of models returned", models.length > 2 ); - boolean found = false; - for ( int idx = 0; idx < models.length; idx++ ) { - if ( models[idx].getDomainId().equals( "steel-wheels" ) && models[idx].getModelId().equals( "BV_HUMAN_RESOURCES" ) ) { - assertEquals( "Wrong domain id", "steel-wheels", models[idx].getDomainId() ); - assertEquals( "Wrong description", "This model contains information about Employees.", models[idx] - .getModelDescription() ); - assertEquals( "Wrong model id", "BV_HUMAN_RESOURCES", models[idx].getModelId() ); - assertEquals( "Wrong model name", "Human Resources", models[idx].getModelName() ); - found = true; - } - } - assertTrue( "model was not found", found ); - } - - @Test - public void testParameter() { - Parameter param = new Parameter(); - - param.setDefaultValue( new String[] { "default" } ); - assertEquals( "default", param.getValue()[0] ); - assertEquals( "default", param.getDefaultValue()[0] ); - - param.setValue( new String[] { "value" } ); - assertEquals( "value", param.getValue()[0] ); - assertEquals( "default", param.getDefaultValue()[0] ); - - param.setType( "String" ); - assertEquals( "String", param.getType() ); - - param.setName( "myparam" ); - assertEquals( "myparam", param.getName() ); - } - - @Test - public void testCondition1() { - - Condition condition = new Condition(); - condition.setCategory( "cat" ); - condition.setColumn( "column" ); - condition.setCombinationType( CombinationType.AND.name() ); - condition.setOperator( Operator.EQUAL.name() ); - condition.setValue( new String[] { "bingo" } ); - condition.setParameterized( true ); - - String str = condition.getCondition( DataType.STRING.getName() ); - assertEquals( "[cat.column] = [param:bingo]", str ); - - condition.setValue( new String[] { "bingo" } ); - str = condition.getCondition( DataType.STRING.getName(), condition.getColumn() ); - assertEquals( "[cat.column] = [param:column]", str ); - - condition.setValue( new String[] { "bingo" } ); - str = condition.getCondition( DataType.DATE.getName(), condition.getColumn() ); - assertEquals( "[cat.column] =DATEVALUE([param:bingo])", str ); - - condition.setValue( new String[] { "bingo" } ); - str = condition.getCondition( DataType.STRING.getName(), null ); - assertEquals( "[cat.column] = \"bingo\"", str ); - - condition.setValue( new String[] { "bingo" } ); - str = condition.getCondition( DataType.DATE.getName(), null ); - assertEquals( "[cat.column] =DATEVALUE(\"bingo\")", str ); - - str = condition.getCondition( DataType.STRING.getName(), "myparam" ); - assertEquals( "[cat.column] = [param:myparam]", str ); - - } - - @Test - public void testCondition_aggregate() { - Condition c = new Condition(); - c.setCategory( "cat" ); - c.setColumn( "column" ); - c.setCombinationType( CombinationType.OR.name() ); - c.setValue( new String[] { "testing" } ); - - String str = c.getCondition( DataType.STRING.getName(), null ); - assertEquals( "[cat.column] = \"testing\"", str ); - - c.setSelectedAggType( AggregationType.MINIMUM.name() ); - c.setValue( new String[] { "testing" } ); - str = c.getCondition( DataType.STRING.getName(), null ); - assertEquals( "[cat.column.MINIMUM] = \"testing\"", str ); - } - -} diff --git a/impl/server/src/it/java/org/pentaho/common/ui/services/UserSettingServiceIT.java b/impl/server/src/it/java/org/pentaho/common/ui/services/UserSettingServiceIT.java deleted file mode 100644 index 926821e1c5..0000000000 --- a/impl/server/src/it/java/org/pentaho/common/ui/services/UserSettingServiceIT.java +++ /dev/null @@ -1,92 +0,0 @@ -/*! - * This program is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License, version 2.1 as published by the Free Software - * Foundation. - * - * You should have received a copy of the GNU Lesser General Public License along with this - * program; if not, you can obtain a copy at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html - * or from the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU Lesser General Public License for more details. - * - * Copyright (c) 2002-2017 Hitachi Vantara.. All rights reserved. - */ - -package org.pentaho.common.ui.services; - -import org.pentaho.common.ui.IntegrationTestConstants; -import org.pentaho.platform.api.usersettings.IUserSettingService; -import org.pentaho.platform.engine.core.system.PentahoSessionHolder; -import org.pentaho.platform.engine.core.system.PentahoSystem; -import org.pentaho.platform.engine.core.system.StandaloneSession; -import org.pentaho.test.platform.engine.core.BaseTest; - -@SuppressWarnings( { "all" } ) -public class UserSettingServiceIT extends BaseTest { - - public String getSolutionPath() { - return IntegrationTestConstants.SOLUTION_PATH; - } - - public void setUp() { - super.setUp(); - } - - public void testUserSetting() throws Exception { - - StandaloneSession session = new StandaloneSession(); - PentahoSessionHolder.setSession( session ); - - IUserSettingService settingsService = - PentahoSystem.get( IUserSettingService.class, PentahoSessionHolder.getSession() ); - settingsService.setUserSetting( "setting1", "fred" ); - - UserSettingService svc = new UserSettingService(); - // this should return an error - String json = svc.getUserSettingsJson( null ); - assertTrue( json.indexOf( "\"class\":\"org.pentaho.common.ui.services.StatusMessage\"" ) != -1 ); - - // this should return an error - Setting[] settings = svc.getUserSettings( "bogus" ); - assertTrue( settings != null ); - assertEquals( 0, settings.length ); - json = svc.getUserSettingsJson( "bogus" ); - System.out.println( json ); - assertEquals( "[]", json ); - - json = svc.setUserSettingJson( "setting1", "value1" ); - System.out.println( json ); - assertTrue( json.indexOf( "\"class\":\"org.pentaho.common.ui.services.StatusMessage\"" ) != -1 ); - assertTrue( json.indexOf( "SUCCESS" ) != -1 ); - - settings = svc.getUserSettings( "setting1" ); - assertTrue( settings != null ); - assertEquals( 1, settings.length ); - assertEquals( "setting1", settings[0].getName() ); - assertEquals( "value1", settings[0].getValue() ); - - json = svc.getUserSettingsJson( "setting1" ); - System.out.println( json ); - assertTrue( json.indexOf( "\"class\":\"org.pentaho.common.ui.services.StatusMessage\"" ) == -1 ); - - json = svc.setUserSettingJson( "setting2", "value2" ); - - json = svc.getUserSettingsJson( "setting1,setting2" ); - settings = svc.getUserSettings( "setting1,setting2" ); - assertTrue( settings != null ); - assertEquals( 2, settings.length ); - assertEquals( "setting1", settings[0].getName() ); - assertEquals( "value1", settings[0].getValue() ); - assertEquals( "setting2", settings[1].getName() ); - assertEquals( "value2", settings[1].getValue() ); - - // generate an error during a set - json = svc.setUserSettingJson( "setting2", "error" ); - System.out.println( json ); - assertTrue( json.indexOf( "ERROR_0003_SETTINGS_WRITE" ) != -1 ); - - } -} diff --git a/impl/server/src/main/java/org/pentaho/common/ui/metadata/service/MetadataService.java b/impl/server/src/main/java/org/pentaho/common/ui/metadata/service/MetadataService.java deleted file mode 100644 index 599b9d56c8..0000000000 --- a/impl/server/src/main/java/org/pentaho/common/ui/metadata/service/MetadataService.java +++ /dev/null @@ -1,442 +0,0 @@ -/*! - * This program is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License, version 2.1 as published by the Free Software - * Foundation. - * - * You should have received a copy of the GNU Lesser General Public License along with this - * program; if not, you can obtain a copy at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html - * or from the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU Lesser General Public License for more details. - * - * Copyright (c) 2002-2017 Hitachi Vantara.. All rights reserved. - */ - -package org.pentaho.common.ui.metadata.service; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.json.JSONException; -import org.pentaho.common.ui.messages.Messages; -import org.pentaho.common.ui.metadata.model.impl.Model; -import org.pentaho.common.ui.metadata.model.impl.ModelInfo; -import org.pentaho.common.ui.metadata.model.impl.ModelInfoComparator; -import org.pentaho.common.ui.metadata.model.impl.Query; -import org.pentaho.commons.connection.IPentahoResultSet; -import org.pentaho.commons.connection.marshal.MarshallableResultSet; -import org.pentaho.metadata.model.Domain; -import org.pentaho.metadata.model.LogicalModel; -import org.pentaho.metadata.query.model.util.QueryXmlHelper; -import org.pentaho.metadata.repository.IMetadataDomainRepository; -import org.pentaho.platform.api.engine.ILogger; -import org.pentaho.platform.engine.core.system.PentahoBase; -import org.pentaho.platform.engine.core.system.PentahoSessionHolder; -import org.pentaho.platform.engine.core.system.PentahoSystem; -import org.pentaho.platform.plugin.action.pentahometadata.MetadataQueryComponent; -import org.pentaho.platform.util.messages.LocaleHelper; -import org.pentaho.pms.core.exception.PentahoMetadataException; - -import flexjson.JSONSerializer; - -/** - * An object that makes lightweight, serializable metadata models available to callers, and allow queries to be - * executed. All objects are simple POJOs. This object can be used as a Axis web service. - * - * @author jamesdixon - * - */ -public class MetadataService extends PentahoBase { - - private static final long serialVersionUID = 8481450224870463494L; - - private Log logger = LogFactory.getLog( MetadataService.class ); - - private MetadataServiceUtil util = new MetadataServiceUtil(); - private MetadataServiceUtil2 util2 = new MetadataServiceUtil2(); - private QueryXmlHelper helper = new QueryXmlHelper(); - - public MetadataService() { - setLoggingLevel( ILogger.ERROR ); - } - - /** - * Returns a list of the available business models - * - * @param domainName - * optional domain to limit the results - * @param context - * Area to check for model visibility - * @return list of ModelInfo objects representing the available models - * @throws IOException - */ - public ModelInfo[] listBusinessModels( String domainName, String context ) throws IOException { - - List models = new ArrayList(); - - // get hold of the metadata repository - IMetadataDomainRepository repo = getMetadataRepository(); - if ( repo == null ) { - error( Messages.getErrorString( "MetadataService.ERROR_0001_BAD_REPO" ) ); //$NON-NLS-1$ - return null; - } - - try { - if ( StringUtils.isEmpty( domainName ) ) { - // if no domain has been specified, loop over all of them - for ( String domain : repo.getDomainIds() ) { - getModelInfos( domain, context, models ); - } - } else { - // get the models for the specified domain - getModelInfos( domainName, context, models ); - } - } catch ( Throwable t ) { - error( Messages.getErrorString( "MetadataService.ERROR_0002_BAD_MODEL_LIST" ), t ); //$NON-NLS-1$ - } - - Collections.sort( models, new ModelInfoComparator() ); - return models.toArray( new ModelInfo[models.size()] ); - } - - /** - * Returns a JSON list of the available business models - * - * @param domainName - * optional domain to limit the results - * @param context - * Area to check for model visibility - * @return JSON string of list of ModelInfo objects representing the available models - * @throws IOException - */ - public String listBusinessModelsJson( String domainName, String context ) throws IOException { - - ModelInfo[] models = listBusinessModels( domainName, context ); - JSONSerializer serializer = new JSONSerializer(); - String json = serializer.deepSerialize( models ); - return json; - } - - /** - * Returns a list of ModelInfo objects for the specified domain. These objects are small and this list is intended to - * allow a client to provide a list of models to a user so the user can pick which one they want to work with. - * - * @param domain - * @param context - * Area to check for model visibility - * @param models - */ - private void getModelInfos( final String domain, final String context, List models ) { - - IMetadataDomainRepository repo = getMetadataRepository(); - - Domain domainObject = repo.getDomain( domain ); - if ( domainObject == null ) { - // the domain does not exist - return; - } - - // find the best locale - String locale = LocaleHelper.getClosestLocale( LocaleHelper.getLocale().toString(), domainObject.getLocaleCodes() ); - - // iterate over all of the models in this domain - for ( LogicalModel model : domainObject.getLogicalModels() ) { - String vis = (String) model.getProperty( "visible" ); - if ( vis != null ) { - String[] visibleContexts = vis.split( "," ); - boolean visibleToContext = false; - for ( String c : visibleContexts ) { - if ( c.equals( context ) ) { - visibleToContext = true; - break; - } - } - if ( !visibleToContext ) { - continue; - } - } - // create a new ModelInfo object and give it the envelope information about the model - ModelInfo modelInfo = new ModelInfo(); - modelInfo.setDomainId( domain ); - modelInfo.setModelId( model.getId() ); - modelInfo.setModelName( model.getName( locale ).replaceAll( "<", "<" ).replaceAll( ">", ">" ) ); - if ( model.getDescription() != null ) { - String modelDescription = model.getDescription( locale ); - modelInfo.setModelDescription( modelDescription ); - } - models.add( modelInfo ); - } - return; - } - - /** - * Returns a Model object for the requested model. The model will include the basic metadata - categories and columns. - * - * @param domainId - * @param modelId - * @return - */ - public Model loadModel( String domainId, String modelId ) { - - if ( domainId == null ) { - // we can't do this without a model - error( Messages.getErrorString( "MetadataService.ERROR_0003_NULL_DOMAIN" ) ); //$NON-NLS-1$ - return null; - } - - if ( modelId == null ) { - // we can't do this without a model - error( Messages.getErrorString( "MetadataService.ERROR_0004_NULL_Model" ) ); //$NON-NLS-1$ - return null; - } - - // because it's lighter weight, check the thin model - Domain domain = getMetadataRepository().getDomain( domainId ); - if ( domain == null ) { - error( Messages.getErrorString( "MetadataService.ERROR_0005_DOMAIN_NOT_FOUND", domainId ) ); //$NON-NLS-1$ - return null; - } - - LogicalModel model = domain.findLogicalModel( modelId ); - - if ( model == null ) { - // the model cannot be found or cannot be loaded - error( Messages.getErrorString( "MetadataService.ERROR_0006_MODEL_NOT_FOUND", modelId ) ); //$NON-NLS-1$ - return null; - } - - // create the thin metadata model and return it - MetadataServiceUtil util = getMetadataServiceUtil(); - util.setDomain( domain ); - Model thinModel = util.createThinModel( model, domainId ); - return thinModel; - - } - - /** - * Returns a JSON Model object for the requested model. The model will include the basic metadata - categories and - * columns. - * - * @param domainId - * @param modelId - * @return JSON string of the model - */ - public String loadModelJson( String domainId, String modelId ) { - - Model model = loadModel( domainId, modelId ); - JSONSerializer serializer = new JSONSerializer(); - String json = serializer.deepSerialize( model ); - return json; - } - - /** - * Executes a query model and returns a serializable result set - * - * @param query - * @param rowLimit - * An optional row limit, -1 or null means all rows - * @return - */ - public MarshallableResultSet doQuery( Query query, Integer rowLimit ) { - - MetadataServiceUtil util = getMetadataServiceUtil(); - org.pentaho.metadata.query.model.Query fullQuery = util.convertQuery( query ); - QueryXmlHelper helper = getHelper(); - String xml = helper.toXML( fullQuery ); - return doXmlQuery( xml, rowLimit ); - } - - /** - * Executes a XML query and returns a serializable result set - * - * @param query - * @param rowLimit - * An optional row limit, -1 or null means all rows - * @return - */ - public MarshallableResultSet doXmlQuery( String xml, Integer rowLimit ) { - IPentahoResultSet resultSet = executeQuery( xml, rowLimit ); - if ( resultSet == null ) { - return null; - } - MarshallableResultSet result = new MarshallableResultSet(); - result.setResultSet( resultSet ); - return result; - } - - /** - * Executes a XML query and returns a JSON serialization of the result set - * - * @param query - * @param rowLimit - * @return - */ - public String doXmlQueryToJson( String xml, int rowLimit ) { - MarshallableResultSet resultSet = doXmlQuery( xml, rowLimit ); - if ( resultSet == null ) { - return null; - } - JSONSerializer serializer = new JSONSerializer(); - String json = serializer.deepSerialize( resultSet ); - return json; - } - - /** - * Executes a XML query and returns a CDA compatible JSON serialization of the result set - * - * @param query - * @param rowLimit - * @return - */ - public String doXmlQueryToCdaJson( String xml, int rowLimit ) { - IPentahoResultSet resultSet = executeQuery( xml, rowLimit ); - if ( resultSet == null ) { - return null; - } - String json = null; - try { - MetadataServiceUtil2 util = getMetadataServiceUtil2(); - Domain domain = util.getDomainObject( xml ); - util.setDomain( domain ); - String locale = LocaleHelper.getClosestLocale( LocaleHelper.getLocale().toString(), domain.getLocaleCodes() ); - json = util.createCdaJson( resultSet, locale ); - } catch ( JSONException e ) { - error( Messages.getErrorString( "MetadataService.ERROR_0007_JSON_ERROR" ), e ); //$NON-NLS-1$ - } catch ( PentahoMetadataException e ) { - error( Messages.getErrorString( "MetadataService.ERROR_0007_BAD_QUERY_DOMAIN" ), e ); //$NON-NLS-1$ - } - return json; - } - - /** - * Executes a XML query and returns a serializable result set - * - * @param query - * @param rowLimit - * An optional row limit, -1 or null means all rows - * @return - */ - public MarshallableResultSet doJsonQuery( String json, Integer rowLimit ) { - - // return the results - return doXmlQuery( getQueryXmlFromJson( json ), rowLimit ); - } - - /** - * Executes a XML query and returns a JSON serialization of the result set - * - * @param query - * @param rowLimit - * @return - */ - public String doJsonQueryToJson( String json, int rowLimit ) { - // return the results - return doXmlQueryToJson( getQueryXmlFromJson( json ), rowLimit ); - } - - /** - * Executes a XML query and returns a CDA compatible JSON serialization of the result set - * - * @param query - * @param rowLimit - * @return - */ - public String doJsonQueryToCdaJson( String json, int rowLimit ) { - // return the results - return doXmlQueryToCdaJson( getQueryXmlFromJson( json ), rowLimit ); - } - - /** - * Executes a XML query and returns a native result set - * - * @param query - * @param rowLimit - * An optional row limit, -1 or null means all rows - * @return - */ - protected IPentahoResultSet executeQuery( String query, Integer rowLimit ) { - // create a component to execute the query - MetadataQueryComponent dataComponent = new MetadataQueryComponent(); - dataComponent.setQuery( query ); - dataComponent.setLive( false ); - dataComponent.setUseForwardOnlyResultSet( true ); - if ( rowLimit != null && rowLimit > -1 ) { - // set the row limit - dataComponent.setMaxRows( rowLimit ); - } - if ( dataComponent.execute() ) { - return dataComponent.getResultSet(); - } - return null; - } - - /** - * Converts a JSON query into a full Query object by going via a thin Query object - * - * @param json - * @return - */ - protected String getQueryXmlFromJson( String json ) { - MetadataServiceUtil util = getMetadataServiceUtil(); - Query query = util.deserializeJsonQuery( json ); - try { - // convert the thin query model into a full one - org.pentaho.metadata.query.model.Query fullQuery = util.convertQuery( query ); - - // get the XML for the query - QueryXmlHelper helper = getHelper(); - String xml = helper.toXML( fullQuery ); - return xml; - } catch ( Exception e ) { - error( Messages.getErrorString( "MetadataService.ERROR_0008_BAD_QUERY" ), e ); //$NON-NLS-1$ - } - return null; - } - - /** - * Returns a instance of the IMetadataDomainRepository for the current session - * - * @return - */ - protected IMetadataDomainRepository getMetadataRepository() { - IMetadataDomainRepository mdr = - PentahoSystem.get( IMetadataDomainRepository.class, PentahoSessionHolder.getSession() ); - if ( mdr instanceof ILogger ) { - ( (ILogger) mdr ).setLoggingLevel( getLoggingLevel() ); - } - return mdr; - } - - @Override - public Log getLogger() { - return logger; - } - - /** - * package-local visibility for testing purposes - */ - MetadataServiceUtil getMetadataServiceUtil() { - return util; - } - - /** - * package-local visibility for testing purposes - */ - MetadataServiceUtil2 getMetadataServiceUtil2() { - return util2; - } - - /** - * package-local visibility for testing purposes - */ - QueryXmlHelper getHelper() { - return helper; - } -} diff --git a/impl/server/src/main/java/org/pentaho/common/ui/metadata/service/MetadataService2.java b/impl/server/src/main/java/org/pentaho/common/ui/metadata/service/MetadataService2.java deleted file mode 100644 index 26029fc82f..0000000000 --- a/impl/server/src/main/java/org/pentaho/common/ui/metadata/service/MetadataService2.java +++ /dev/null @@ -1,449 +0,0 @@ -/*! - * This program is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License, version 2.1 as published by the Free Software - * Foundation. - * - * You should have received a copy of the GNU Lesser General Public License along with this - * program; if not, you can obtain a copy at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html - * or from the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU Lesser General Public License for more details. - * - * Copyright (c) 2002-2017 Hitachi Vantara.. All rights reserved. - */ - -package org.pentaho.common.ui.metadata.service; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.StringTokenizer; - -import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.json.JSONException; -import org.pentaho.common.ui.messages.Messages; -import org.pentaho.commons.connection.IPentahoResultSet; -import org.pentaho.commons.connection.marshal.MarshallableResultSet; -import org.pentaho.metadata.datatable.DataTable; -import org.pentaho.metadata.model.Domain; -import org.pentaho.metadata.model.LogicalModel; -import org.pentaho.metadata.model.thin.Model; -import org.pentaho.metadata.model.thin.ModelInfo; -import org.pentaho.metadata.model.thin.ModelInfoComparator; -import org.pentaho.metadata.model.thin.ModelProvider; -import org.pentaho.metadata.model.thin.Provider; -import org.pentaho.metadata.model.thin.Query; -import org.pentaho.metadata.query.model.util.QueryXmlHelper; -import org.pentaho.metadata.repository.IMetadataDomainRepository; -import org.pentaho.platform.api.engine.ILogger; -import org.pentaho.platform.engine.core.system.PentahoBase; -import org.pentaho.platform.engine.core.system.PentahoSessionHolder; -import org.pentaho.platform.engine.core.system.PentahoSystem; -import org.pentaho.platform.plugin.action.pentahometadata.MetadataQueryComponent; -import org.pentaho.platform.util.messages.LocaleHelper; -import org.pentaho.pms.core.exception.PentahoMetadataException; - -import flexjson.JSONSerializer; - -/** - * An object that makes lightweight, serializable metadata models available to callers, and allow queries to be - * executed. All objects are simple POJOs. This object can be used as a Axis web service. - * - * @author jamesdixon - * - */ -public class MetadataService2 extends PentahoBase implements ModelProvider { - - public static final String PROVIDER_ID = "MetadataImpl"; - - private static final long serialVersionUID = 8481450224870463494L; - - private Log logger = LogFactory.getLog( MetadataService2.class ); - - private MetadataServiceUtil2 util2 = new MetadataServiceUtil2(); - private QueryXmlHelper helper = new QueryXmlHelper(); - private Provider provider; - - public MetadataService2() { - setLoggingLevel( ILogger.ERROR ); - provider = new Provider(); - provider.setId( PROVIDER_ID ); - provider.setName( "Relational Metadata" ); - } - - /** - * Returns a list of the available business models - * - * @param domainName - * optional domain to limit the results - * @param context - * Area to check for model visibility - * @return list of ModelInfo objects representing the available models - */ - @Override - public ModelInfo[] getModelList( String providerId, String domain, String match ) { - - if ( providerId != null && !providerId.equals( PROVIDER_ID ) ) { - return new ModelInfo[0]; - } - List models = new ArrayList(); - - // get hold of the metadata repository - IMetadataDomainRepository repo = getMetadataRepository(); - if ( repo == null ) { - error( Messages.getErrorString( "MetadataService.ERROR_0001_BAD_REPO" ) ); //$NON-NLS-1$ - return null; - } - - try { - if ( StringUtils.isEmpty( domain ) ) { - // if no domain has been specified, loop over all of them - for ( String aDomain : repo.getDomainIds() ) { - getModelInfos( match, aDomain, models ); - } - } else { - // get the models for the specified domain - getModelInfos( match, domain, models ); - } - } catch ( Throwable t ) { - error( Messages.getErrorString( "MetadataService.ERROR_0002_BAD_MODEL_LIST" ), t ); //$NON-NLS-1$ - } - - Collections.sort( models, new ModelInfoComparator() ); - return models.toArray( new ModelInfo[models.size()] ); - } - - /** - * Returns a list of ModelInfo objects for the specified domain. These objects are small and this list is intended to - * allow a client to provide a list of models to a user so the user can pick which one they want to work with. - * - * @param domain - * @param context - * Area to check for model visibility - * @param models - */ - private void getModelInfos( final String match, final String domain, List models ) { - - IMetadataDomainRepository repo = getMetadataRepository(); - - String context = null; - Domain domainObject = repo.getDomain( domain ); - if ( domainObject == null ) { - // the domain does not exist - return; - } - - // find the best locale - String locale = LocaleHelper.getClosestLocale( LocaleHelper.getLocale().toString(), domainObject.getLocaleCodes() ); - - // iterate over all of the models in this domain - for ( LogicalModel model : domainObject.getLogicalModels() ) { - String vis = (String) model.getProperty( "visible" ); - if ( vis != null ) { - String[] visibleContexts = vis.split( "," ); - boolean visibleToContext = false; - for ( String c : visibleContexts ) { - if ( c.equals( context ) ) { - // TODO investigate situation. Now context always is null. - visibleToContext = true; - break; - } - } - if ( !visibleToContext ) { - continue; - } - } - // create a new ModelInfo object and give it the envelope information about the model - ModelInfo modelInfo = new ModelInfo(); - modelInfo.setGroupId( domain ); - modelInfo.setModelId( model.getId() ); - modelInfo.setName( model.getName( locale ) ); - modelInfo.setProvider( provider ); - if ( model.getDescription() != null ) { - String modelDescription = model.getDescription( locale ); - modelInfo.setDescription( modelDescription ); - } - models.add( modelInfo ); - } - return; - } - - /** - * Returns a Model object for the requested model. The model will include the basic metadata - categories and columns. - * - * @param domainId - * @param modelId - * @return - */ - @Override - public Model getModel( String id ) { - - // parse out the id - StringTokenizer tokenizer = new StringTokenizer( id, "~" ); - - String providerId = null; - String domainId = null; - String modelId = null; - while ( tokenizer.hasMoreElements() ) { - String str = tokenizer.nextToken(); - if ( providerId == null ) { - providerId = str; - } else if ( domainId == null ) { - domainId = str; - } else { - modelId = str; - } - } - - if ( domainId == null ) { - // we can't do this without a model - error( Messages.getErrorString( "MetadataService.ERROR_0003_NULL_DOMAIN" ) ); //$NON-NLS-1$ - return null; - } - - if ( modelId == null ) { - // we can't do this without a model - error( Messages.getErrorString( "MetadataService.ERROR_0004_NULL_Model" ) ); //$NON-NLS-1$ - return null; - } - - // because it's lighter weight, check the thin model - Domain domain = getMetadataRepository().getDomain( domainId ); - if ( domain == null ) { - error( Messages.getErrorString( "MetadataService.ERROR_0005_DOMAIN_NOT_FOUND", domainId ) ); //$NON-NLS-1$ - return null; - } - - LogicalModel model = domain.findLogicalModel( modelId ); - - if ( model == null ) { - // the model cannot be found or cannot be loaded - error( Messages.getErrorString( "MetadataService.ERROR_0006_MODEL_NOT_FOUND", modelId ) ); //$NON-NLS-1$ - return null; - } - - // create the thin metadata model and return it - MetadataServiceUtil2 util = getMetadataServiceUtil2(); - util.setDomain( domain ); - Model thinModel = util.createThinModel( model, domainId ); - thinModel.setProvider( provider ); - return thinModel; - - } - - /** - * Executes a query model and returns a serializable result set - * - * @param query - * @param rowLimit - * An optional row limit, -1 or null means all rows - * @return - */ - @Override - public DataTable executeQuery( Query query, int rowLimit ) { - return null; - } - - public MarshallableResultSet doQuery( Query query, Integer rowLimit ) { - - MetadataServiceUtil2 util = getMetadataServiceUtil2(); - - Model model = getModel( query.getSourceId() ); - - org.pentaho.metadata.query.model.Query fullQuery = util.convertQuery( query, model ); - QueryXmlHelper helper = getHelper(); - String xml = helper.toXML( fullQuery ); - return doXmlQuery( xml, rowLimit ); - } - - /** - * Executes a XML query and returns a serializable result set - * - * @param query - * @param rowLimit - * An optional row limit, -1 or null means all rows - * @return - */ - public MarshallableResultSet doXmlQuery( String xml, Integer rowLimit ) { - IPentahoResultSet resultSet = executeQuery( xml, rowLimit ); - if ( resultSet == null ) { - return null; - } - MarshallableResultSet result = new MarshallableResultSet(); - result.setResultSet( resultSet ); - return result; - } - - /** - * Executes a XML query and returns a JSON serialization of the result set - * - * @param query - * @param rowLimit - * @return - */ - public String doXmlQueryToJson( String xml, int rowLimit ) { - MarshallableResultSet resultSet = doXmlQuery( xml, rowLimit ); - if ( resultSet == null ) { - return null; - } - JSONSerializer serializer = new JSONSerializer(); - String json = serializer.deepSerialize( resultSet ); - return json; - } - - /** - * Executes a XML query and returns a CDA compatible JSON serialization of the result set - * - * @param query - * @param rowLimit - * @return - */ - public String doXmlQueryToCdaJson( String xml, int rowLimit ) { - IPentahoResultSet resultSet = executeQuery( xml, rowLimit ); - if ( resultSet == null ) { - return null; - } - String json = null; - try { - MetadataServiceUtil2 util = getMetadataServiceUtil2(); - Domain domain = util.getDomainObject( xml ); - util.setDomain( domain ); - String locale = LocaleHelper.getClosestLocale( LocaleHelper.getLocale().toString(), domain.getLocaleCodes() ); - json = util.createCdaJson( resultSet, locale ); - } catch ( JSONException e ) { - error( Messages.getErrorString( "MetadataService.ERROR_0007_JSON_ERROR" ), e ); //$NON-NLS-1$ - } catch ( PentahoMetadataException e ) { - error( Messages.getErrorString( "MetadataService.ERROR_0007_BAD_QUERY_DOMAIN" ), e ); //$NON-NLS-1$ - } - return json; - } - - /** - * Executes a XML query and returns a serializable result set - * - * @param query - * @param rowLimit - * An optional row limit, -1 or null means all rows - * @return - */ - public MarshallableResultSet doJsonQuery( String json, Integer rowLimit ) { - - // return the results - return doXmlQuery( getQueryXmlFromJson( json ), rowLimit ); - } - - /** - * Executes a XML query and returns a JSON serialization of the result set - * - * @param query - * @param rowLimit - * @return - */ - public String doJsonQueryToJson( String json, int rowLimit ) { - // return the results - return doXmlQueryToJson( getQueryXmlFromJson( json ), rowLimit ); - } - - /** - * Executes a XML query and returns a CDA compatible JSON serialization of the result set - * - * @param query - * @param rowLimit - * @return - */ - public String doJsonQueryToCdaJson( String json, int rowLimit ) { - // return the results - return doXmlQueryToCdaJson( getQueryXmlFromJson( json ), rowLimit ); - } - - /** - * Executes a XML query and returns a native result set - * - * @param query - * @param rowLimit - * An optional row limit, -1 or null means all rows - * @return - */ - protected IPentahoResultSet executeQuery( String query, Integer rowLimit ) { - // create a component to execute the query - MetadataQueryComponent dataComponent = new MetadataQueryComponent(); - dataComponent.setQuery( query ); - dataComponent.setLive( false ); - dataComponent.setUseForwardOnlyResultSet( true ); - if ( rowLimit != null && rowLimit > -1 ) { - // set the row limit - dataComponent.setMaxRows( rowLimit ); - } - if ( dataComponent.execute() ) { - return dataComponent.getResultSet(); - } - return null; - } - - /** - * Converts a JSON query into a full Query object by going via a thin Query object - * - * @param json - * @return - */ - protected String getQueryXmlFromJson( String json ) { - MetadataServiceUtil2 util = getMetadataServiceUtil2(); - Query query = util.deserializeJsonQuery( json ); - try { - // convert the thin query model into a full one - Model model = getModel( query.getSourceId() ); - org.pentaho.metadata.query.model.Query fullQuery = util.convertQuery( query, model ); - - // get the XML for the query - QueryXmlHelper helper = getHelper(); - String xml = helper.toXML( fullQuery ); - return xml; - } catch ( Exception e ) { - error( Messages.getErrorString( "MetadataService.ERROR_0008_BAD_QUERY" ), e ); //$NON-NLS-1$ - } - return null; - } - - /** - * Returns a instance of the IMetadataDomainRepository for the current session - * - * @return - */ - protected IMetadataDomainRepository getMetadataRepository() { - IMetadataDomainRepository mdr = - PentahoSystem.get( IMetadataDomainRepository.class, PentahoSessionHolder.getSession() ); - if ( mdr instanceof ILogger ) { - ( (ILogger) mdr ).setLoggingLevel( getLoggingLevel() ); - } - return mdr; - } - - @Override - public Log getLogger() { - return logger; - } - - @Override - public String getId() { - return PROVIDER_ID; - } - - /** - * package-local visibility for testing purposes - */ - MetadataServiceUtil2 getMetadataServiceUtil2() { - return util2; - } - - /** - * package-local visibility for testing purposes - */ - QueryXmlHelper getHelper() { - return helper; - } -} diff --git a/impl/server/src/main/java/org/pentaho/common/ui/metadata/service/MetadataServiceUtil.java b/impl/server/src/main/java/org/pentaho/common/ui/metadata/service/MetadataServiceUtil.java deleted file mode 100644 index fcaf7b4143..0000000000 --- a/impl/server/src/main/java/org/pentaho/common/ui/metadata/service/MetadataServiceUtil.java +++ /dev/null @@ -1,421 +0,0 @@ -/*! - * This program is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License, version 2.1 as published by the Free Software - * Foundation. - * - * You should have received a copy of the GNU Lesser General Public License along with this - * program; if not, you can obtain a copy at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html - * or from the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU Lesser General Public License for more details. - * - * Copyright (c) 2002-2024 Hitachi Vantara.. All rights reserved. - */ - -package org.pentaho.common.ui.metadata.service; - -import flexjson.JSONDeserializer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; -import org.pentaho.common.ui.messages.Messages; -import org.pentaho.common.ui.metadata.model.impl.Category; -import org.pentaho.common.ui.metadata.model.impl.Column; -import org.pentaho.common.ui.metadata.model.impl.Condition; -import org.pentaho.common.ui.metadata.model.impl.Model; -import org.pentaho.common.ui.metadata.model.impl.Order; -import org.pentaho.common.ui.metadata.model.impl.Parameter; -import org.pentaho.common.ui.metadata.model.impl.Query; -import org.pentaho.commons.connection.IPentahoResultSet; -import org.pentaho.metadata.model.Domain; -import org.pentaho.metadata.model.IPhysicalColumn; -import org.pentaho.metadata.model.LogicalColumn; -import org.pentaho.metadata.model.LogicalModel; -import org.pentaho.metadata.model.concept.Concept; -import org.pentaho.metadata.model.concept.types.AggregationType; -import org.pentaho.metadata.model.concept.types.Alignment; -import org.pentaho.metadata.model.concept.types.DataType; -import org.pentaho.metadata.model.concept.types.FieldType; -import org.pentaho.metadata.model.concept.types.LocalizedString; -import org.pentaho.metadata.query.model.CombinationType; -import org.pentaho.metadata.query.model.Constraint; -import org.pentaho.metadata.query.model.Order.Type; -import org.pentaho.metadata.query.model.Selection; -import org.pentaho.metadata.query.model.util.QueryXmlHelper; -import org.pentaho.metadata.repository.IMetadataDomainRepository; -import org.pentaho.platform.engine.core.system.PentahoBase; -import org.pentaho.platform.engine.core.system.PentahoSessionHolder; -import org.pentaho.platform.engine.core.system.PentahoSystem; -import org.pentaho.platform.engine.security.PentahoJsonValidator; -import org.pentaho.platform.util.messages.LocaleHelper; -import org.pentaho.pms.core.exception.PentahoMetadataException; - -import java.util.ArrayList; -import java.util.List; - -/** - * This class provides utility functions used by the MetadataService - * - * @author jamesdixon - * - */ - -public class MetadataServiceUtil extends PentahoBase { - - private static final long serialVersionUID = -123835493828427853L; - - private Log logger = LogFactory.getLog( MetadataServiceUtil.class ); - - private org.pentaho.metadata.model.Domain domain; - - /** - * Returns the full domain object used by this class - * - * @return - */ - public org.pentaho.metadata.model.Domain getDomain() { - return domain; - } - - /** - * Sets the full domain object used by this class - * - * @param domain - */ - public void setDomain( org.pentaho.metadata.model.Domain domain ) { - this.domain = domain; - } - - public MetadataServiceUtil() { - } - - /** - * Works out what is the most appropriate locale to use given a domain and the user's current locale - * - * @return - */ - protected String getLocale() { - String locale = LocaleHelper.getClosestLocale( LocaleHelper.getLocale().toString(), domain.getLocaleCodes() ); - return locale; - } - - /** - * Creates a lightweight, serializable model object from a logical model - * - * @param m - * @param domainId - * @return - */ - public Model createThinModel( LogicalModel m, String domainId ) { - // create the model object - Model model = new Model(); - model.setName( m.getName( getLocale() ) ); - model.setId( m.getId() ); - model.setDomainId( domainId ); - model.setDescription( m.getDescription( getLocale() ) ); - // add the categories to the model - List categories = new ArrayList(); - for ( org.pentaho.metadata.model.Category cat : m.getCategories() ) { - categories.add( createCategory( m, cat ) ); - } - model.setCategories( categories.toArray( new Category[categories.size()] ) ); - - return model; - - } - - /** - * Creates a lightweight, serializable category objects from a logical model category - * - * @param m - * @param c - * @return - */ - private Category createCategory( LogicalModel m, org.pentaho.metadata.model.Category c ) { - // create a thin category object - Category cat = new Category(); - cat.setName( c.getName( getLocale() ) ); - cat.setId( c.getId() ); - cat.setDescription( c.getDescription( getLocale() ) ); - if ( cat.getId().equals( cat.getDescription() ) ) { - cat.setDescription( null ); - } - List columns = new ArrayList(); - for ( LogicalColumn col : c.getLogicalColumns() ) { - columns.add( createColumn( m, col, c ) ); - } - cat.setColumns( columns.toArray( new Column[columns.size()] ) ); - - return cat; - } - - /** - * Creates a lightweight, serializable Column object from a logical model column - * - * @param m - * @param c - * @return - */ - private Column createColumn( LogicalModel m, LogicalColumn c, org.pentaho.metadata.model.Category category ) { - Column col = new Column(); - col.setName( c.getName( getLocale() ) ); - col.setId( c.getId() ); - col.setDescription( c.getDescription( getLocale() ) ); - if ( col.getId().equals( col.getDescription() ) ) { - col.setDescription( null ); - } - if ( c.getFieldType() != null ) { - col.setFieldType( c.getFieldType().name() ); - } else { - col.setFieldType( "UNKNOWN" ); //$NON-NLS-1$ - } - - col.setType( c.getDataType().getName().toUpperCase() ); - col.setCategory( category.getId() ); - // set the aggregation fields for the column - List possibleAggs = c.getAggregationList(); - List aggTypes = new ArrayList(); - if ( possibleAggs != null ) { - for ( AggregationType agg : possibleAggs ) { - aggTypes.add( agg.name() ); - } - } - - // There might be a default agg, but no agg list. If so, add it to the list. - - AggregationType defaultAggType = AggregationType.NONE; - if ( c.getAggregationType() != null ) { - defaultAggType = c.getAggregationType(); - } - if ( !aggTypes.contains( defaultAggType.name() ) ) { - aggTypes.add( defaultAggType.name() ); - } - col.setAggTypes( aggTypes ); - col.setDefaultAggType( defaultAggType.name() ); - col.setSelectedAggType( defaultAggType.name() ); - - // set the alignment - DataType dataType = c.getDataType(); - FieldType fieldType = c.getFieldType(); - Object obj = c.getProperty( "alignment" ); //$NON-NLS-1$ - if ( obj instanceof Alignment ) { - if ( obj == Alignment.LEFT ) { - col.setHorizontalAlignment( Alignment.LEFT.toString() ); - } else if ( obj == Alignment.RIGHT ) { - col.setHorizontalAlignment( Alignment.RIGHT.toString() ); - } else if ( obj == Alignment.CENTERED ) { - col.setHorizontalAlignment( Alignment.CENTERED.toString() ); - } - } else if ( fieldType == FieldType.FACT ) { - col.setHorizontalAlignment( Alignment.RIGHT.toString() ); - } else if ( fieldType == FieldType.OTHER && dataType == DataType.NUMERIC ) { - col.setHorizontalAlignment( Alignment.RIGHT.toString() ); - } else { - col.setHorizontalAlignment( Alignment.LEFT.toString() ); - } - // set the format mask - obj = c.getProperty( "mask" ); //$NON-NLS-1$ - if ( obj != null ) { - col.setFormatMask( (String) obj ); - } - - Boolean hidden = (Boolean) c.getProperty( "hidden" ); - if ( hidden != null ) { - col.setHiddenForUser( hidden.booleanValue() ); - } - - return col; - } - - /** - * Returns a CDA JSON representation of a query result set - * - * @param resultSet - * @return - * @throws JSONException - */ - public String createCdaJson( final IPentahoResultSet resultSet, String locale ) throws JSONException { - if ( resultSet == null ) { - return null; - } - JSONObject json = new JSONObject(); - - // Generate the metadata - final JSONArray metadataArray = new JSONArray(); - - final int columnCount = resultSet.getColumnCount(); - final int rowCount = resultSet.getRowCount(); - - for ( int i = 0; i < columnCount; i++ ) { - JSONObject info = new JSONObject(); - info.put( "colIndex", i ); //$NON-NLS-1$ - info.put( "colName", resultSet.getMetaData().getColumnHeaders()[0][i] ); //$NON-NLS-1$ - DataType type = (DataType) resultSet.getMetaData().getAttribute( 0, i, IPhysicalColumn.DATATYPE_PROPERTY ); - info.put( "colType", type.getName().toUpperCase() ); //$NON-NLS-1$ - LocalizedString name = (LocalizedString) resultSet.getMetaData().getAttribute( 0, i, Concept.NAME_PROPERTY ); - if ( name != null && locale != null ) { - info.put( "colLabel", name.getString( locale ) ); //$NON-NLS-1$ - } - metadataArray.put( info ); - } - json.put( "metadata", metadataArray ); //$NON-NLS-1$ - - // add the rows of data - final JSONArray valuesArray = new JSONArray(); - for ( int rowIdx = 0; rowIdx < rowCount; rowIdx++ ) { - - final JSONArray rowArray = new JSONArray(); - valuesArray.put( rowArray ); - for ( int colIdx = 0; colIdx < columnCount; colIdx++ ) { - rowArray.put( resultSet.getValueAt( rowIdx, colIdx ) ); - } - } - json.put( "resultset", valuesArray ); //$NON-NLS-1$ - return json.toString(); - } - - /** - * Returns the full domain obejct for a XML MQL query - * - * @param query - * @return - * @throws PentahoMetadataException - */ - public org.pentaho.metadata.model.Domain getDomainObject( String query ) throws PentahoMetadataException { - QueryXmlHelper helper = new QueryXmlHelper(); - IMetadataDomainRepository domainRepository = getDomainRepository(); - org.pentaho.metadata.query.model.Query fatQuery = helper.fromXML( domainRepository, query ); - return fatQuery.getDomain(); - } - - /** - * Converts a thin query model into a full query - * - * @param src - * @return - */ - public org.pentaho.metadata.query.model.Query convertQuery( Query src ) { - - IMetadataDomainRepository domainRepository = getDomainRepository(); - - Domain fullDomain = domainRepository.getDomain( src.getDomainName() ); - LogicalModel logicalModel = fullDomain.findLogicalModel( src.getModelId() ); - - // create a new full query object - org.pentaho.metadata.query.model.Query dest = new org.pentaho.metadata.query.model.Query( fullDomain, logicalModel ); - - // now add the selections - List selections = dest.getSelections(); - for ( Column column : src.getColumns() ) { - // get the objects needed for the selection - LogicalColumn logicalColumn = logicalModel.findLogicalColumn( column.getId() ); - org.pentaho.metadata.model.Category category = getCategory( column.getId(), logicalModel ); - AggregationType aggregationType = AggregationType.valueOf( column.getSelectedAggType() ); - // create a selection and add it to the list - Selection selection = new Selection( category, logicalColumn, aggregationType ); - selections.add( selection ); - } - - // now add the filters - List constraints = dest.getConstraints(); - for ( Condition condition : src.getConditions() ) { - org.pentaho.metadata.query.model.CombinationType combinationType = - CombinationType.valueOf( condition.getCombinationType() ); - LogicalColumn logicalColumn = logicalModel.findLogicalColumn( condition.getColumn() ); - String paramName = condition.isParameterized() ? condition.getValue()[0] : null; - String formula = condition.getCondition( logicalColumn.getDataType().name(), paramName ); - Constraint constraint = new Constraint( combinationType, formula ); - constraints.add( constraint ); - } - - // now set the disable distinct option - if ( src.getDisableDistinct() != null ) { - dest.setDisableDistinct( src.getDisableDistinct() ); - } - - // now add the sorting information - List orders = dest.getOrders(); - for ( Order order : src.getOrders() ) { - // find the selection - for ( Selection selection : selections ) { - if ( selection.getLogicalColumn().getId().equals( order.getColumn() ) ) { - Type type = Type.valueOf( order.getOrderType() ); - org.pentaho.metadata.query.model.Order fullOrder = - new org.pentaho.metadata.query.model.Order( selection, type ); - orders.add( fullOrder ); - } - } - } - - // now add the parameter information - List parameters = dest.getParameters(); - for ( Parameter parameter : src.getParameters() ) { - // find the column for this parameter - LogicalColumn logicalColumn = logicalModel.findLogicalColumn( parameter.getColumn() ); - DataType type = logicalColumn.getDataType(); - String[] value = parameter.getValue(); - final String name = parameter.getName() != null ? parameter.getName() : parameter.getColumn(); - org.pentaho.metadata.query.model.Parameter fullParam = - new org.pentaho.metadata.query.model.Parameter( name, type, value[0] ); - parameters.add( fullParam ); - } - return dest; - } - - /** - * Returns the full category object for a given column within the logical model - * - * @param columnId - * @param logicalModel - * @return - */ - protected org.pentaho.metadata.model.Category getCategory( String columnId, LogicalModel logicalModel ) { - for ( org.pentaho.metadata.model.Category category : logicalModel.getCategories() ) { - if ( category.findLogicalColumn( columnId ) != null ) { - return category; - } - } - return null; - } - - /** - * Deserializes a JSON query into a thin Query object - * - * @param json - * @return - */ - public Query deserializeJsonQuery( String json ) { - try { - // convert the json query into a thin query model - ClassLoader oldLoader = Thread.currentThread().getContextClassLoader(); - try { - Thread.currentThread().setContextClassLoader( getClass().getClassLoader() ); - PentahoJsonValidator.validateJson( json, Query.CLASS_LIST ); - return new JSONDeserializer().deserialize( json, Query.class ); - } finally { - Thread.currentThread().setContextClassLoader( oldLoader ); - } - } catch ( Exception e ) { - error( Messages.getErrorString( "MetadataService.ERROR_0007_BAD_JSON", json ), e ); //$NON-NLS-1$ - return null; - } - } - - @Override - public Log getLogger() { - return logger; - } - - /** - * package-local visibility for testing purposes - */ - IMetadataDomainRepository getDomainRepository() { - return PentahoSystem.get( IMetadataDomainRepository.class, PentahoSessionHolder.getSession() ); - } - -} diff --git a/impl/server/src/main/java/org/pentaho/common/ui/metadata/service/MetadataServiceUtil2.java b/impl/server/src/main/java/org/pentaho/common/ui/metadata/service/MetadataServiceUtil2.java deleted file mode 100644 index d140d4e8a4..0000000000 --- a/impl/server/src/main/java/org/pentaho/common/ui/metadata/service/MetadataServiceUtil2.java +++ /dev/null @@ -1,423 +0,0 @@ -/*! - * This program is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License, version 2.1 as published by the Free Software - * Foundation. - * - * You should have received a copy of the GNU Lesser General Public License along with this - * program; if not, you can obtain a copy at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html - * or from the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU Lesser General Public License for more details. - * - * Copyright (c) 2002-2024 Hitachi Vantara.. All rights reserved. - */ - -package org.pentaho.common.ui.metadata.service; - -import flexjson.JSONDeserializer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; -import org.pentaho.common.ui.messages.Messages; -import org.pentaho.commons.connection.IPentahoResultSet; -import org.pentaho.metadata.model.Domain; -import org.pentaho.metadata.model.IPhysicalColumn; -import org.pentaho.metadata.model.LogicalColumn; -import org.pentaho.metadata.model.LogicalModel; -import org.pentaho.metadata.model.concept.Concept; -import org.pentaho.metadata.model.concept.types.AggregationType; -import org.pentaho.metadata.model.concept.types.Alignment; -import org.pentaho.metadata.model.concept.types.DataType; -import org.pentaho.metadata.model.concept.types.FieldType; -import org.pentaho.metadata.model.concept.types.LocalizedString; -import org.pentaho.metadata.model.thin.Condition; -import org.pentaho.metadata.model.thin.Element; -import org.pentaho.metadata.model.thin.Model; -import org.pentaho.metadata.model.thin.ModelInfo; -import org.pentaho.metadata.model.thin.Order; -import org.pentaho.metadata.model.thin.Parameter; -import org.pentaho.metadata.model.thin.Query; -import org.pentaho.metadata.query.model.CombinationType; -import org.pentaho.metadata.query.model.Constraint; -import org.pentaho.metadata.query.model.Order.Type; -import org.pentaho.metadata.query.model.Selection; -import org.pentaho.metadata.query.model.util.QueryXmlHelper; -import org.pentaho.metadata.repository.IMetadataDomainRepository; -import org.pentaho.platform.engine.core.system.PentahoBase; -import org.pentaho.platform.engine.core.system.PentahoSessionHolder; -import org.pentaho.platform.engine.core.system.PentahoSystem; -import org.pentaho.platform.engine.security.PentahoJsonValidator; -import org.pentaho.platform.util.messages.LocaleHelper; -import org.pentaho.pms.core.exception.PentahoMetadataException; - -import java.util.ArrayList; -import java.util.List; - -/** - * This class provides utility functions used by the MetadataService - * - * @author jamesdixon - * - */ - -public class MetadataServiceUtil2 extends PentahoBase { - - private static final long serialVersionUID = -123835493828427853L; - - private Log logger = LogFactory.getLog( MetadataServiceUtil2.class ); - - private org.pentaho.metadata.model.Domain domain; - - /** - * Returns the full domain object used by this class - * - * @return - */ - public org.pentaho.metadata.model.Domain getDomain() { - return domain; - } - - /** - * Sets the full domain object used by this class - * - * @param domain - */ - public void setDomain( org.pentaho.metadata.model.Domain domain ) { - this.domain = domain; - } - - public MetadataServiceUtil2() { - } - - /** - * Works out what is the most appropriate locale to use given a domain and the user's current locale - * - * @return - */ - protected String getLocale() { - String locale = LocaleHelper.getClosestLocale( LocaleHelper.getLocale().toString(), domain.getLocaleCodes() ); - return locale; - } - - /** - * Creates a lightweight, serializable model object from a logical model - * - * @param m - * @param domainId - * @return - */ - public Model createThinModel( LogicalModel m, String domainId ) { - // create the model object - Model model = new Model(); - model.setName( m.getName( getLocale() ) ); - model.setModelId( m.getId() ); - model.setGroupId( domainId ); - model.setDescription( m.getDescription( getLocale() ) ); - // add the categories to the model - List elements = new ArrayList(); - for ( org.pentaho.metadata.model.Category cat : m.getCategories() ) { - createCategory( m, cat, elements ); - } - model.setElements( elements.toArray( new Element[elements.size()] ) ); - - return model; - - } - - /** - * Creates a lightweight, serializable category objects from a logical model category - * - * @param m - * @param c - * @return - */ - private void createCategory( LogicalModel m, org.pentaho.metadata.model.Category c, List elements ) { - // create a thin category object - Element cat = new Element(); - cat.setName( c.getName( getLocale() ) ); - cat.setId( c.getId() ); - cat.setDescription( c.getDescription( getLocale() ) ); - if ( cat.getId().equals( cat.getDescription() ) ) { - cat.setDescription( null ); - } - cat.setIsQueryElement( false ); - elements.add( cat ); - for ( LogicalColumn col : c.getLogicalColumns() ) { - elements.add( createColumn( m, col, c, cat ) ); - } - } - - /** - * Creates a lightweight, serializable Column object from a logical model column - * - * @param m - * @param c - * @return - */ - private Element createColumn( LogicalModel m, LogicalColumn c, org.pentaho.metadata.model.Category category, - Element cat ) { - Element col = new Element(); - col.setName( c.getName( getLocale() ) ); - col.setId( c.getId() ); - col.setDescription( c.getDescription( getLocale() ) ); - col.setParentId( cat.getId() ); - if ( col.getId().equals( col.getDescription() ) ) { - col.setDescription( null ); - } - if ( c.getFieldType() != null ) { - col.setElementType( c.getFieldType().name() ); - } else { - col.setElementType( "UNKNOWN" ); //$NON-NLS-1$ - } - - col.setDataType( c.getDataType().getName().toUpperCase() ); - col.setParentId( category.getId() ); - // set the aggregation fields for the column - List possibleAggs = c.getAggregationList(); - List aggTypes = new ArrayList(); - if ( possibleAggs != null ) { - for ( AggregationType agg : possibleAggs ) { - aggTypes.add( agg.name() ); - } - } - - // There might be a default agg, but no agg list. If so, add it to the list. - - AggregationType defaultAggType = AggregationType.NONE; - if ( c.getAggregationType() != null ) { - defaultAggType = c.getAggregationType(); - } - if ( !aggTypes.contains( defaultAggType.name() ) ) { - aggTypes.add( defaultAggType.name() ); - } - col.setAvailableAggregations( aggTypes.toArray( new String[aggTypes.size()] ) ); - col.setDefaultAggregation( defaultAggType.name() ); - col.setSelectedAggregation( defaultAggType.name() ); - - // set the alignment - DataType dataType = c.getDataType(); - FieldType fieldType = c.getFieldType(); - Object obj = c.getProperty( "alignment" ); //$NON-NLS-1$ - if ( obj instanceof Alignment ) { - if ( obj == Alignment.LEFT ) { - col.setHorizontalAlignment( Alignment.LEFT.toString() ); - } else if ( obj == Alignment.RIGHT ) { - col.setHorizontalAlignment( Alignment.RIGHT.toString() ); - } else if ( obj == Alignment.CENTERED ) { - col.setHorizontalAlignment( Alignment.CENTERED.toString() ); - } - } else if ( fieldType == FieldType.FACT ) { - col.setHorizontalAlignment( Alignment.RIGHT.toString() ); - } else if ( fieldType == FieldType.OTHER && dataType == DataType.NUMERIC ) { - col.setHorizontalAlignment( Alignment.RIGHT.toString() ); - } else { - col.setHorizontalAlignment( Alignment.LEFT.toString() ); - } - // set the format mask - obj = c.getProperty( "mask" ); //$NON-NLS-1$ - if ( obj != null ) { - col.setFormatMask( (String) obj ); - } - - Boolean hidden = (Boolean) c.getProperty( "hidden" ); - if ( hidden != null ) { - col.setHiddenForUser( hidden.booleanValue() ); - } - - return col; - } - - /** - * Returns a CDA JSON representation of a query result set - * - * @param resultSet - * @return - * @throws JSONException - */ - public String createCdaJson( final IPentahoResultSet resultSet, String locale ) throws JSONException { - if ( resultSet == null ) { - return null; - } - JSONObject json = new JSONObject(); - - // Generate the metadata - final JSONArray metadataArray = new JSONArray(); - - final int columnCount = resultSet.getColumnCount(); - final int rowCount = resultSet.getRowCount(); - - for ( int i = 0; i < columnCount; i++ ) { - JSONObject info = new JSONObject(); - info.put( "colIndex", i ); //$NON-NLS-1$ - info.put( "colName", resultSet.getMetaData().getColumnHeaders()[0][i] ); //$NON-NLS-1$ - DataType type = (DataType) resultSet.getMetaData().getAttribute( 0, i, IPhysicalColumn.DATATYPE_PROPERTY ); - info.put( "colType", type.getName().toUpperCase() ); //$NON-NLS-1$ - LocalizedString name = (LocalizedString) resultSet.getMetaData().getAttribute( 0, i, Concept.NAME_PROPERTY ); - if ( name != null && locale != null ) { - info.put( "colLabel", name.getString( locale ) ); //$NON-NLS-1$ - } - metadataArray.put( info ); - } - json.put( "metadata", metadataArray ); //$NON-NLS-1$ - - // add the rows of data - final JSONArray valuesArray = new JSONArray(); - for ( int rowIdx = 0; rowIdx < rowCount; rowIdx++ ) { - - final JSONArray rowArray = new JSONArray(); - valuesArray.put( rowArray ); - for ( int colIdx = 0; colIdx < columnCount; colIdx++ ) { - rowArray.put( resultSet.getValueAt( rowIdx, colIdx ) ); - } - } - json.put( "resultset", valuesArray ); //$NON-NLS-1$ - return json.toString(); - } - - /** - * Returns the full domain object for a XML MQL query - * - * @param query - * @return - * @throws PentahoMetadataException - */ - public org.pentaho.metadata.model.Domain getDomainObject( String query ) throws PentahoMetadataException { - QueryXmlHelper helper = new QueryXmlHelper(); - IMetadataDomainRepository domainRepository = getDomainRepository(); - org.pentaho.metadata.query.model.Query fatQuery = helper.fromXML( domainRepository, query ); - return fatQuery.getDomain(); - } - - /** - * Converts a thin query model into a full query - * - * @param src - * @return - */ - public org.pentaho.metadata.query.model.Query convertQuery( Query src, ModelInfo info ) { - - IMetadataDomainRepository domainRepository = getDomainRepository(); - - Domain fullDomain = domainRepository.getDomain( info.getGroupId() ); - LogicalModel logicalModel = fullDomain.findLogicalModel( info.getModelId() ); - - // create a new full query object - org.pentaho.metadata.query.model.Query dest = new org.pentaho.metadata.query.model.Query( fullDomain, logicalModel ); - - // now add the selections - List selections = dest.getSelections(); - for ( Element column : src.getElements() ) { - // get the objects needed for the selection - LogicalColumn logicalColumn = logicalModel.findLogicalColumn( column.getId() ); - org.pentaho.metadata.model.Category category = getCategory( column.getId(), logicalModel ); - AggregationType aggregationType = AggregationType.valueOf( column.getSelectedAggregation() ); - // create a selection and add it to the list - Selection selection = new Selection( category, logicalColumn, aggregationType ); - selections.add( selection ); - } - - // now add the filters - List constraints = dest.getConstraints(); - for ( Condition condition : src.getConditions() ) { - org.pentaho.metadata.query.model.CombinationType combinationType = - CombinationType.valueOf( condition.getCombinationType() ); - LogicalColumn logicalColumn = logicalModel.findLogicalColumn( condition.getElementId() ); - String paramName = condition.isParameterized() ? condition.getValue()[0] : null; - String formula = condition.getCondition( logicalColumn.getDataType().name(), paramName ); - Constraint constraint = new Constraint( combinationType, formula ); - constraints.add( constraint ); - } - - // now set the disable distinct option - if ( src.getDisableDistinct() != null ) { - dest.setDisableDistinct( src.getDisableDistinct() ); - } - - // now add the sorting information - List orders = dest.getOrders(); - for ( Order order : src.getOrders() ) { - // find the selection - for ( Selection selection : selections ) { - if ( selection.getLogicalColumn().getId().equals( order.getElementId() ) ) { - Type type = Type.valueOf( order.getOrderType() ); - org.pentaho.metadata.query.model.Order fullOrder = - new org.pentaho.metadata.query.model.Order( selection, type ); - orders.add( fullOrder ); - } - } - } - - // now add the parameter information - List parameters = dest.getParameters(); - for ( Parameter parameter : src.getParameters() ) { - // find the column for this parameter - LogicalColumn logicalColumn = logicalModel.findLogicalColumn( parameter.getElementId() ); - DataType type = logicalColumn.getDataType(); - String[] value = parameter.getValue(); - final String name = parameter.getName() != null ? parameter.getName() : parameter.getElementId(); - org.pentaho.metadata.query.model.Parameter fullParam = - new org.pentaho.metadata.query.model.Parameter( name, type, value[0] ); - parameters.add( fullParam ); - } - return dest; - } - - /** - * Returns the full category object for a given column within the logical model - * - * @param columnId - * @param logicalModel - * @return - */ - protected org.pentaho.metadata.model.Category getCategory( String columnId, LogicalModel logicalModel ) { - for ( org.pentaho.metadata.model.Category category : logicalModel.getCategories() ) { - if ( category.findLogicalColumn( columnId ) != null ) { - return category; - } - } - return null; - } - - /** - * Deserializes a JSON query into a thin Query object - * - * @param json - * @return - */ - public Query deserializeJsonQuery( String json ) { - try { - // convert the json query into a thin query model - ClassLoader oldLoader = Thread.currentThread().getContextClassLoader(); - try { - Thread.currentThread().setContextClassLoader( getClass().getClassLoader() ); - PentahoJsonValidator.validateJson( json, Query.CLASS_LIST ); - return new JSONDeserializer().deserialize( json, Query.class ); - } catch (Exception e){ - e.printStackTrace(); - return null; - } finally { - Thread.currentThread().setContextClassLoader( oldLoader ); - } - } catch ( Exception e ) { - error( Messages.getErrorString( "MetadataService.ERROR_0007_BAD_JSON", json ), e ); //$NON-NLS-1$ - return null; - } - } - - @Override - public Log getLogger() { - return logger; - } - - /** - * package-local visibility for testing purposes - */ - IMetadataDomainRepository getDomainRepository() { - return PentahoSystem.get( IMetadataDomainRepository.class, PentahoSessionHolder.getSession() ); - } -} diff --git a/impl/server/src/main/java/org/pentaho/common/ui/services/SolutionRepoService.java b/impl/server/src/main/java/org/pentaho/common/ui/services/SolutionRepoService.java deleted file mode 100644 index 8bb2d8b39a..0000000000 --- a/impl/server/src/main/java/org/pentaho/common/ui/services/SolutionRepoService.java +++ /dev/null @@ -1,194 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License, version 2 as published by the Free Software - * Foundation. - * - * You should have received a copy of the GNU General Public License along with this - * program; if not, you can obtain a copy at http://www.gnu.org/licenses/gpl-2.0.html - * or from the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * - * Copyright 2006 - 2017 Hitachi Vantara. All rights reserved. - */ - -package org.pentaho.common.ui.services; - -import java.net.URLDecoder; - -import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.pentaho.common.ui.messages.Messages; -import org.pentaho.platform.engine.core.solution.ActionInfo; -import org.pentaho.platform.engine.core.system.PentahoBase; - -/** - * Saves state to the solution repository. This content generator requires the following parameters: filepath - the path - * within the solution repository to save to state - the state (text) type - the content type being saved replace - - * (true/false) whether to replace an existing file. Defaults to false. title - optional title description - optional - * description - * - * @author jamesdixon - * - */ -public class SolutionRepoService extends PentahoBase { - - private static final long serialVersionUID = 8445693289282403228L; - - /** - * Saves text state (e.g. JSON) into the solution repository - */ - public StateMessage saveStateString( String filepath, String state, String type, Boolean replace, String title, - String description ) throws Exception { - - return this.saveState( filepath, state, false, type, replace, title, description ); - - } - - /** - * Saves XML state into the solution repository - */ - public StateMessage saveStateXml( String filepath, String state, String type, Boolean replace, String title, - String description ) throws Exception { - - return this.saveState( filepath, state, true, type, replace, title, description ); - - } - - /** - * Saves state into the solution repository - */ - protected StateMessage saveState( String filepath, String state, boolean stateIsXml, String type, Boolean replace, - String title, String description ) throws Exception { - - StateMessage result = new StateMessage(); - - result.setStatus( StateMessage.STATUS_FAILED ); - if ( StringUtils.isEmpty( filepath ) ) { - result.setMessage( Messages.getErrorString( "SolutionRepo.ERROR_0001_NO_FILEPATH" ) ); //$NON-NLS-1$ - return result; - } - if ( StringUtils.isEmpty( state ) ) { - result.setMessage( Messages.getErrorString( "SolutionRepo.ERROR_0002_NO_STATE" ) ); //$NON-NLS-1$ - return result; - } - if ( StringUtils.isEmpty( type ) ) { - result.setMessage( Messages.getErrorString( "SolutionRepo.ERROR_0007_NO_TYPE" ) ); //$NON-NLS-1$ - return result; - } - if ( replace == null ) { - replace = Boolean.FALSE; - // return result; - } - - // make sure the path is good - ActionInfo info = ActionInfo.parseActionString( filepath ); - if ( info == null ) { - result.setMessage( Messages.getErrorString( "SolutionUrlContentGenerator.ERROR_0005_BAD_FILEPATH", filepath ) ); //$NON-NLS-1$ - return result; - } - - /* - * IPentahoSession userSession = PentahoSessionHolder.getSession(); - * - * - * // Leaving this commented out so that when we do port it to IUnifiedRepository we still have the business logic. - * - * - * ISolutionRepository repo = PentahoSystem.get(ISolutionRepository.class, userSession); - * - * // create the state file to save Document doc = DocumentHelper.createDocument(); Element root = - * doc.addElement("state-file"); //$NON-NLS-1$ Element documentation = root.addElement("documentation"); - * //$NON-NLS-1$ documentation.addElement("author").addCDATA( userSession.getName() ); //$NON-NLS-1$ - * - * if( stateIsXml ) { Element stateElement = root.addElement("state-xml"); //$NON-NLS-1$ Document stateDoc = null; - * try { stateDoc = DocumentHelper.parseText(state); } catch (Exception e) { result.setMessage( - * Messages.getErrorString("SolutionRepo.ERROR_0009_BAD_STATE", state ) ); //$NON-NLS-1$ return result; } Node - * stateRoot = stateDoc.getRootElement(); stateRoot = stateRoot.detach(); stateElement.add(stateRoot); } else { - * Element stateElement = root.addElement("state-text"); //$NON-NLS-1$ stateElement.addCDATA( state ); } - * - * documentation.addElement("title").addCDATA( title ); //$NON-NLS-1$ - * documentation.addElement("description").addCDATA( description ); //$NON-NLS-1$ - * - * String fileName = info.getActionName(); if( !fileName.endsWith( '.'+type )) { fileName = fileName+'.'+type; } - * - * // see if we can find a content generator to get the file icon IPluginManager pluginManager = PentahoSystem.get( - * IPluginManager.class, userSession ); if( pluginManager != null ) { // IContentInfo contentInfo = - * pluginManager.getContentInfoFromExtension(type, userSession); IContentInfo contentInfo = - * pluginManager.getContentTypeInfo(type); if( contentInfo != null ) { String icon = contentInfo.getIconUrl(); - * documentation.addElement("icon").addCDATA( icon ); //$NON-NLS-1$ } } - * - * String basePath = PentahoSystem.getApplicationContext().getSolutionRootPath(); if( - * !basePath.endsWith(""+ISolutionRepository.SEPARATOR) ) { //$NON-NLS-1$ basePath = - * basePath+ISolutionRepository.SEPARATOR; } // save the file int ret = repo.addSolutionFile( basePath, - * info.getSolutionName()+'/'+info.getPath(), fileName, doc.asXML().getBytes(), replace); - * - * if( ret == ISolutionRepository.FILE_EXISTS ) { result.setMessage( Messages.getErrorString( - * "SolutionRepo.ERROR_0004_CANNOT_REPLACE" ) ); //$NON-NLS-1$ return result; } else if( ret == - * ISolutionRepository.FILE_ADD_INVALID_USER_CREDENTIALS ) { - * result.setMessage(Messages.getErrorString("SolutionRepo.ERROR_0005_CREDENTIALS") ); //$NON-NLS-1$ return result; - * } else if( ret != ISolutionRepository.FILE_ADD_SUCCESSFUL ) { - * result.setMessage(Messages.getErrorString("SolutionRepo.ERROR_0006_SAVE_FAILED") ); //$NON-NLS-1$ return result; - * } - * - * result.setStatus(StateMessage.STATUS_SUCCESS); - * result.setMessage(Messages.getString("SolutionRepo.USER_FILE_SAVE") ); //$NON-NLS-1$ return result; - */ - return null; - } - - public StateMessage loadState( String filepath ) throws Exception { - // make sure we have the path to load from - StateMessage result = new StateMessage(); - - // URL decode the filepath - filepath = URLDecoder.decode( filepath ); - - result.setStatus( StateMessage.STATUS_FAILED ); - if ( StringUtils.isEmpty( filepath ) ) { - result.setMessage( Messages.getErrorString( "SolutionRepo.ERROR_0001_NO_FILEPATH" ) ); //$NON-NLS-1$ - return result; - } - - ActionInfo info = ActionInfo.parseActionString( filepath ); - if ( info == null ) { - result.setMessage( Messages.getErrorString( "SolutionRepo.ERROR_0003_BAD_PATH", filepath ) ); //$NON-NLS-1$ - return result; - } - - /* - * IPentahoSession userSession = PentahoSessionHolder.getSession(); - * - * - * // Leaving this commented out so that when we do port it to IUnifiedRepository we still have the business logic. - * - * ISolutionRepository repo = PentahoSystem.get(ISolutionRepository.class, userSession); - * - * // try to get the file from the repository // Document doc = repo.getResourceAsDocument(filepath, - * ISolutionRepository.ACTION_EXECUTE); Document doc = repo.getNavigationUIDocument(null, filepath, - * ISolutionRepository.ACTION_EXECUTE); - * - * if( doc != null ) { Element stateNode = (Element) doc.selectSingleNode( "state-file/state-xml" ); //$NON-NLS-1$ - * if( stateNode != null ) { // write the loaded state to the output stream - * result.setStatus(StateMessage.STATUS_SUCCESS); result.setState(stateNode.asXML()); return result; } stateNode = - * (Element) doc.selectSingleNode( "state-file/state-text" ); //$NON-NLS-1$ if( stateNode != null ) { // write the - * loaded state to the output stream result.setStatus(StateMessage.STATUS_SUCCESS); - * result.setState(stateNode.getText()); return result; } - * - * } result.setMessage(Messages.getErrorString("SolutionRepo.ERROR_0001_LOAD_FAILED", filepath) ); //$NON-NLS-1$ - * return result; - */ - return null; - } - - @Override - public Log getLogger() { - return LogFactory.getLog( SolutionRepoService.class ); - } - -} diff --git a/impl/server/src/main/java/org/pentaho/common/ui/services/UserSettingService.java b/impl/server/src/main/java/org/pentaho/common/ui/services/UserSettingService.java deleted file mode 100644 index 293851e698..0000000000 --- a/impl/server/src/main/java/org/pentaho/common/ui/services/UserSettingService.java +++ /dev/null @@ -1,140 +0,0 @@ -/*! - * This program is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License, version 2.1 as published by the Free Software - * Foundation. - * - * You should have received a copy of the GNU Lesser General Public License along with this - * program; if not, you can obtain a copy at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html - * or from the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU Lesser General Public License for more details. - * - * Copyright (c) 2002-2017 Hitachi Vantara.. All rights reserved. - */ - -package org.pentaho.common.ui.services; - -import java.util.ArrayList; -import java.util.List; -import java.util.StringTokenizer; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.pentaho.platform.api.usersettings.IUserSettingService; -import org.pentaho.platform.api.usersettings.pojo.IUserSetting; -import org.pentaho.platform.engine.core.system.PentahoBase; -import org.pentaho.platform.engine.core.system.PentahoSessionHolder; -import org.pentaho.platform.engine.core.system.PentahoSystem; -import org.pentaho.common.ui.messages.Messages; - -import flexjson.JSONSerializer; - -/** - * A service for reading and writing user settings. This class can be used to provide SOAP and JSON services for thin - * clients. - * - * @author jamesdixon - * - */ -public class UserSettingService extends PentahoBase { - - /** - * - */ - private static final long serialVersionUID = 1372909204550846766L; - - public static final String THEME_KEY = "common-ui-user-theme"; //$NON-NLS-1$ - - /** - * Sets a user setting and returns a status message. - * - * @param settingName - * @param settingValue - * @return - */ - public StatusMessage setUserSetting( String settingName, String settingValue ) { - JsonUtil utils = new JsonUtil(); - try { - IUserSettingService settingsService = - PentahoSystem.get( IUserSettingService.class, PentahoSessionHolder.getSession() ); - settingsService.setUserSetting( settingName, settingValue ); - return utils.createMessage( "SUCCESS", "0" ); //$NON-NLS-1$ //$NON-NLS-2$ - } catch ( Exception e ) { - return utils - .createMessage( - Messages.getString( "UserSettingService.ERROR_0003_SETTINGS_WRITE", settingName ), "InteractiveAdhocService.ERROR_0003_SETTINGS_WRITE" ); //$NON-NLS-1$ //$NON-NLS-2$ - } - } - - /** - * Sets a user setting and returns a JSON status message. - * - * @param settingName - * @param settingValue - * @return - */ - public String setUserSettingJson( String settingName, String settingValue ) { - - StatusMessage msg = setUserSetting( settingName, settingValue ); - return new JSONSerializer().deepSerialize( msg ); - - } - - /** - * Given a comma separated list of setting names, return their values - * - * @param settingNames - * @return - */ - public Setting[] getUserSettings( String settingNames ) throws Exception { - StringTokenizer tokenizer = new StringTokenizer( settingNames, "," ); //$NON-NLS-1$ - IUserSettingService settingsService = - PentahoSystem.get( IUserSettingService.class, PentahoSessionHolder.getSession() ); - String settingName, value; - IUserSetting srcSetting; - List settings = new ArrayList(); - while ( tokenizer.hasMoreTokens() ) { - settingName = tokenizer.nextToken(); - srcSetting = settingsService.getUserSetting( settingName, null ); - if ( srcSetting != null ) { - value = srcSetting.getSettingValue(); - // create a new setting object - Setting setting = new Setting(); - setting.setName( settingName ); - setting.setValue( value ); - settings.add( setting ); - } - } - Setting[] settingArray = new Setting[settings.size()]; - settings.toArray( settingArray ); - return settingArray; - } - - /** - * Given a comma separated list of setting names, return their a JSON object with the values - * - * @param settingNames - * @return - */ - public String getUserSettingsJson( String settingNames ) { - JsonUtil utils = new JsonUtil(); - try { - Setting[] settingArray = getUserSettings( settingNames ); - JSONSerializer serializer = new JSONSerializer(); - String json = serializer.deepSerialize( settingArray ); - return json; - } catch ( Exception e ) { - error( Messages.getErrorString( "UserSettingService.ERROR_0002_SETTINGS_READ", e.getLocalizedMessage() ), e ); //$NON-NLS-1$ - return utils.createJsonMessage( Messages.getString( - "UserSettingService.ERROR_0002_SETTINGS_READ", e.getLocalizedMessage() ), "ERROR_0002_SETTINGS_READ" ); //$NON-NLS-1$ //$NON-NLS-2$ - } - } - - @Override - public Log getLogger() { - return LogFactory.getLog( UserSettingService.class ); - } -} diff --git a/impl/server/src/main/resources/org/pentaho/common/ui/messages/messages.properties b/impl/server/src/main/resources/org/pentaho/common/ui/messages/messages.properties index 95ca733e83..fc5f89c3be 100644 --- a/impl/server/src/main/resources/org/pentaho/common/ui/messages/messages.properties +++ b/impl/server/src/main/resources/org/pentaho/common/ui/messages/messages.properties @@ -17,30 +17,6 @@ # Created Jan, 2011 # @author jdixon -UserSettingService.ERROR_0002_SETTINGS_READ=Cannot read user settings: {0} -UserSettingService.ERROR_0003_SETTINGS_WRITE=Cannot write user setting: {0} - -MetadataService.ERROR_0001_BAD_REPO=Error getting metadata repository -MetadataService.ERROR_0002_BAD_MODEL_LIST=Error getting list of metadata models -MetadataService.ERROR_0003_NULL_DOMAIN=Domain id cannot be null -MetadataService.ERROR_0004_NULL_Model=Model id cannot be null -MetadataService.ERROR_0005_DOMAIN_NOT_FOUND=Domain cannot be found or loaded: {0} -MetadataService.ERROR_0006_MODEL_NOT_FOUND=Model cannot be found or loaded: {0} -MetadataService.ERROR_0007_JSON_ERROR=Could not create JSON object for result set -MetadataService.ERROR_0007_BAD_QUERY_DOMAIN=Could not get metadata domain for the query -MetadataService.ERROR_0007_BAD_JSON=Could not convert JSON to java object: {0} -MetadataService.ERROR_0008_BAD_QUERY=Could not create metadata query object - -SolutionRepo.ERROR_0001_NO_FILEPATH=No 'filepath' parameter provided -SolutionRepo.ERROR_0002_NO_STATE=No 'state' parameter provided -SolutionRepo.ERROR_0003_BAD_PATH=Filepath provided is invalid: {0} -SolutionRepo.ERROR_0004_CANNOT_REPLACE=File exists but 'replace' parameter was not set -SolutionRepo.ERROR_0005_CREDENTIALS=Invalid credentials -SolutionRepo.ERROR_0006_SAVE_FAILED=Could not save file to repository -SolutionRepo.ERROR_0007_NO_TYPE=No 'TYPE' parameter provided -SolutionRepo.ERROR_0008_LOAD_FAILED=File load failed (missing or invalid file): {0} -SolutionRepo.ERROR_0009_BAD_STATE=State is not valid xml: {0} -SolutionRepo.USER_FILE_SAVE=File saved successfully SolutionURLContentGenerator.ERROR_0001_NO_FILEPATH=No 'path' parameter provided SolutionURLContentGenerator.ERROR_0002_CANNOT_HANDLE_TYPE=Invalid content type: {0} diff --git a/impl/server/src/main/resources/org/pentaho/common/ui/messages/messages_CN.properties b/impl/server/src/main/resources/org/pentaho/common/ui/messages/messages_CN.properties index a87e315327..909a25aff5 100644 --- a/impl/server/src/main/resources/org/pentaho/common/ui/messages/messages_CN.properties +++ b/impl/server/src/main/resources/org/pentaho/common/ui/messages/messages_CN.properties @@ -17,31 +17,6 @@ # Created Jan, 2011 # @author jdixon -UserSettingService.ERROR_0002_SETTINGS_READ=\u7121\u6cd5\u8b80\u53d6\u4f7f\u7528\u8005\u8a2d\u5b9a\uff1a{0} -UserSettingService.ERROR_0003_SETTINGS_WRITE=\u7121\u6cd5\u5beb\u5165\u4f7f\u7528\u8005\u8a2d\u5b9a\uff1a{0} - -MetadataService.ERROR_0001_BAD_REPO=\u53d6\u5f97\u5f8c\u8a2d\u8cc7\u6599\u5b58\u653e\u5eab\u6642\u767c\u751f\u932f\u8aa4 -MetadataService.ERROR_0002_BAD_MODEL_LIST=\u53d6\u5f97\u5f8c\u8a2d\u8cc7\u6599\u6a21\u578b\u6e05\u55ae\u6642\u767c\u751f\u932f\u8aa4 -MetadataService.ERROR_0003_NULL_DOMAIN=\u7db2\u57df\u8b58\u5225\u78bc\u4e0d\u80fd\u662f Null -MetadataService.ERROR_0004_NULL_Model=\u6a21\u578b\u8b58\u5225\u78bc\u4e0d\u80fd\u662f Null -MetadataService.ERROR_0005_DOMAIN_NOT_FOUND=\u627e\u4e0d\u5230\u6216\u7121\u6cd5\u8f09\u5165\u7db2\u57df\uff1a{0} -MetadataService.ERROR_0006_MODEL_NOT_FOUND=\u627e\u4e0d\u5230\u6216\u7121\u6cd5\u8f09\u5165\u6a21\u578b\uff1a{0} -MetadataService.ERROR_0007_JSON_ERROR=\u7121\u6cd5\u70ba\u7d50\u679c\u96c6\u5efa\u7acb JSON \u7269\u4ef6 -MetadataService.ERROR_0007_BAD_QUERY_DOMAIN=\u7121\u6cd5\u70ba\u67e5\u8a62\u53d6\u5f97\u5f8c\u8a2d\u8cc7\u6599\u7db2\u57df -MetadataService.ERROR_0007_BAD_JSON=\u7121\u6cd5\u5c07 JSON \u8f49\u63db\u70ba Java \u7269\u4ef6\uff1a{0} -MetadataService.ERROR_0008_BAD_QUERY=\u7121\u6cd5\u5efa\u7acb\u5f8c\u8a2d\u8cc7\u6599\u67e5\u8a62\u7269\u4ef6 - -SolutionRepo.ERROR_0001_NO_FILEPATH=\u672a\u63d0\u4f9b 'filepath' \u53c3\u6578 -SolutionRepo.ERROR_0002_NO_STATE=\u672a\u63d0\u4f9b 'state' \u53c3\u6578 -SolutionRepo.ERROR_0003_BAD_PATH=\u63d0\u4f9b\u7684\u6a94\u6848\u8def\u5f91\u7121\u6548\uff1a{0} -SolutionRepo.ERROR_0004_CANNOT_REPLACE=\u6a94\u6848\u5b58\u5728\uff0c\u4f46\u672a\u8a2d\u5b9a 'replace' \u53c3\u6578 -SolutionRepo.ERROR_0005_CREDENTIALS=\u7121\u6548\u7684\u8a8d\u8b49 -SolutionRepo.ERROR_0006_SAVE_FAILED=\u7121\u6cd5\u5c07\u6a94\u6848\u5132\u5b58\u5230\u5b58\u653e\u5eab -SolutionRepo.ERROR_0007_NO_TYPE=\u672a\u63d0\u4f9b\u4efb\u4f55 'TYPE' \u53c3\u6578 -SolutionRepo.ERROR_0008_LOAD_FAILED=\u7121\u6cd5\u8f09\u5165\u6a94\u6848 (\u907a\u5931\u6216\u7121\u6548\u7684\u6a94\u6848)\uff1a{0} -SolutionRepo.ERROR_0009_BAD_STATE=\u72c0\u614b\u4e0d\u662f\u6709\u6548\u7684 XML\uff1a{0} -SolutionRepo.USER_FILE_SAVE=\u5df2\u6210\u529f\u5132\u5b58\u6a94\u6848 - SolutionURLContentGenerator.ERROR_0001_NO_FILEPATH=\u672a\u63d0\u4f9b 'path' \u53c3\u6578 SolutionURLContentGenerator.ERROR_0002_CANNOT_HANDLE_TYPE=\u7121\u6548\u7684\u5167\u5bb9\u985e\u578b\uff1a{0} SolutionURLContentGenerator.ERROR_0003_RESOURCE_NOT_FOUND=\u627e\u4e0d\u5230\u8cc7\u6e90\uff1a{0} diff --git a/impl/server/src/main/resources/org/pentaho/common/ui/messages/messages_de.properties b/impl/server/src/main/resources/org/pentaho/common/ui/messages/messages_de.properties index 72700abb93..23ad8199df 100644 --- a/impl/server/src/main/resources/org/pentaho/common/ui/messages/messages_de.properties +++ b/impl/server/src/main/resources/org/pentaho/common/ui/messages/messages_de.properties @@ -17,30 +17,6 @@ # Created Jan, 2011 # @author jdixon -UserSettingService.ERROR_0002_SETTINGS_READ=Benutzereinstellungen k\u00f6nnen nicht gelesen werden: {0} -UserSettingService.ERROR_0003_SETTINGS_WRITE=Benutzereinstellung kann nicht geschrieben werden: {0} - -MetadataService.ERROR_0001_BAD_REPO=Fehler beim Abrufen des Metadaten-Repositorys -MetadataService.ERROR_0002_BAD_MODEL_LIST=Fehler beim Abrufen der Metadaten-Modellliste -MetadataService.ERROR_0003_NULL_DOMAIN=Die Dom\u00e4nen-ID darf nicht ung\u00fcltig sein -MetadataService.ERROR_0004_NULL_Model=Die Modell-ID darf nicht ung\u00fcltig sein -MetadataService.ERROR_0005_DOMAIN_NOT_FOUND=Die Dom\u00e4ne kann nicht gefunden oder geladen werden: {0} -MetadataService.ERROR_0006_MODEL_NOT_FOUND=Das Modell kann nicht gefunden oder geladen werden: {0} -MetadataService.ERROR_0007_JSON_ERROR=Es konnte kein JSON-Objekt f\u00fcr das Resultset erzeugt werden -MetadataService.ERROR_0007_BAD_QUERY_DOMAIN=Es konnte keine Metadaten-Dom\u00e4ne f\u00fcr die Anforderung abgerufen werden -MetadataService.ERROR_0007_BAD_JSON=JSON- konnte nicht in Java-Objekt umgewandelt werden: {0} -MetadataService.ERROR_0008_BAD_QUERY=Es konnte kein Metadaten-Abfrageobjekt erzeugt werden - -SolutionRepo.ERROR_0001_NO_FILEPATH=Kein Parameter "Dateipfad" bereitgestellt -SolutionRepo.ERROR_0002_NO_STATE=Kein Parameter "Zustand" bereitgestellt -SolutionRepo.ERROR_0003_BAD_PATH=Der bereitgestellte Dateipfad ist ung\u00fcltig: {0} -SolutionRepo.ERROR_0004_CANNOT_REPLACE=Die Datei existiert, aber der Parameter "Ersetzen" wurde nicht gesetzt. -SolutionRepo.ERROR_0005_CREDENTIALS=Ung\u00fcltige Anmeldeinformationen -SolutionRepo.ERROR_0006_SAVE_FAILED=Datei konnte nicht im Repository gespeichert werden -SolutionRepo.ERROR_0007_NO_TYPE=Kein "TYPE"-Parameter bereitgestellt -SolutionRepo.ERROR_0008_LOAD_FAILED=Laden der Datei fehlgeschlagen (fehlende oder ung\u00fcltige Datei): {0} -SolutionRepo.ERROR_0009_BAD_STATE=Der Zustand ist keine g\u00fcltige XML: {0} -SolutionRepo.USER_FILE_SAVE=Datei erfolgreich gespeichert SolutionURLContentGenerator.ERROR_0001_NO_FILEPATH=Es ist kein Parameter "Pfad" bereitgestellt SolutionURLContentGenerator.ERROR_0002_CANNOT_HANDLE_TYPE=Ung\u00fcltiger Inhaltstyp: {0} diff --git a/impl/server/src/main/resources/org/pentaho/common/ui/messages/messages_fr.properties b/impl/server/src/main/resources/org/pentaho/common/ui/messages/messages_fr.properties index 0f381711d3..c32bab6f8f 100644 --- a/impl/server/src/main/resources/org/pentaho/common/ui/messages/messages_fr.properties +++ b/impl/server/src/main/resources/org/pentaho/common/ui/messages/messages_fr.properties @@ -17,30 +17,6 @@ # Created Jan, 2011 # @author jdixon -UserSettingService.ERROR_0002_SETTINGS_READ=Impossible de lire les param\u00e8tres de l'utilisateur\u0020: {0} -UserSettingService.ERROR_0003_SETTINGS_WRITE=Impossible d'\u00e9crire les param\u00e8tres de l'utilisateur\u0020: {0} - -MetadataService.ERROR_0001_BAD_REPO=Erreur lors de la r\u00e9cup\u00e9ration du r\u00e9f\u00e9rentiel de m\u00e9tadonn\u00e9es -MetadataService.ERROR_0002_BAD_MODEL_LIST=Erreur lors de la r\u00e9cup\u00e9ration de la liste des mod\u00e8les de m\u00e9tadonn\u00e9es -MetadataService.ERROR_0003_NULL_DOMAIN=L'ID du domaine ne peut pas \u00eatre nul -MetadataService.ERROR_0004_NULL_Model=L'ID du mod\u00e8le ne peut pas \u00eatre nul -MetadataService.ERROR_0005_DOMAIN_NOT_FOUND=Impossible de trouver ou de charger le domaine\u0020: {0} -MetadataService.ERROR_0006_MODEL_NOT_FOUND=Impossible de trouver ou de charger le mod\u00e8le\u0020: {0} -MetadataService.ERROR_0007_JSON_ERROR=Impossible de cr\u00e9er l'objet JSON pour l'ensemble de r\u00e9sultats -MetadataService.ERROR_0007_BAD_QUERY_DOMAIN=Impossible de r\u00e9cup\u00e9rer le domaine de m\u00e9tadonn\u00e9es pour la requ\u00eate -MetadataService.ERROR_0007_BAD_JSON=Impossible de convertir l'objet JSON en objet Java\u0020: {0} -MetadataService.ERROR_0008_BAD_QUERY=Impossible de cr\u00e9er l'objet de requ\u00eate de m\u00e9tadonn\u00e9es - -SolutionRepo.ERROR_0001_NO_FILEPATH=Aucun param\u00e8tre \u00ab chemin d'acc\u00e8s \u00bb n'est fourni -SolutionRepo.ERROR_0002_NO_STATE=Aucun param\u00e8tre \u00ab \u00e9tat \u00bb n'est fourni -SolutionRepo.ERROR_0003_BAD_PATH=Le chemin d'acc\u00e8s fourni n'est pas valide\u0020: {0} -SolutionRepo.ERROR_0004_CANNOT_REPLACE=Le fichier existe mais le param\u00e8tre \u00ab remplacer \u00bb n'a pas \u00e9t\u00e9 d\u00e9fini -SolutionRepo.ERROR_0005_CREDENTIALS=Identifiants non valides -SolutionRepo.ERROR_0006_SAVE_FAILED=Impossible d'enregistrer le fichier dans le r\u00e9f\u00e9rentiel -SolutionRepo.ERROR_0007_NO_TYPE=Aucun param\u00e8tre 'TYPE' fourni -SolutionRepo.ERROR_0008_LOAD_FAILED=Le chargement du fichier a \u00e9chou\u00e9 (fichier manquant ou non valide)\u0020: {0} -SolutionRepo.ERROR_0009_BAD_STATE=L'\u00e9tat n'est pas un XML valide\u0020: {0} -SolutionRepo.USER_FILE_SAVE=Le fichier a \u00e9t\u00e9 enregistr\u00e9 avec succ\u00e8s SolutionURLContentGenerator.ERROR_0001_NO_FILEPATH=Aucun param\u00e8tre de chemin n'a \u00e9t\u00e9 fourni SolutionURLContentGenerator.ERROR_0002_CANNOT_HANDLE_TYPE=Type de contenu non valide\u0020: {0} diff --git a/impl/server/src/main/resources/org/pentaho/common/ui/messages/messages_ja.properties b/impl/server/src/main/resources/org/pentaho/common/ui/messages/messages_ja.properties index 7bc1ad0eba..32cfbf9a58 100644 --- a/impl/server/src/main/resources/org/pentaho/common/ui/messages/messages_ja.properties +++ b/impl/server/src/main/resources/org/pentaho/common/ui/messages/messages_ja.properties @@ -17,31 +17,6 @@ # Created Jan, 2011 # @author jdixon -UserSettingService.ERROR_0002_SETTINGS_READ=\u30e6\u30fc\u30b6\u30fc\u8a2d\u5b9a\u3092\u8aad\u307f\u8fbc\u3080\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093: {0} -UserSettingService.ERROR_0003_SETTINGS_WRITE=\u30e6\u30fc\u30b6\u30fc\u8a2d\u5b9a\u3092\u66f8\u304d\u8fbc\u3080\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093: {0} - -MetadataService.ERROR_0001_BAD_REPO=Error getting metadata repository -MetadataService.ERROR_0002_BAD_MODEL_LIST=Error getting list of metadata models -MetadataService.ERROR_0003_NULL_DOMAIN=Domain id cannot be null -MetadataService.ERROR_0004_NULL_Model=Model id cannot be null -MetadataService.ERROR_0005_DOMAIN_NOT_FOUND=Domain cannot be found or loaded: {0} -MetadataService.ERROR_0006_MODEL_NOT_FOUND=Model cannot be found or loaded: {0} -MetadataService.ERROR_0007_JSON_ERROR=Could not create JSON object for result set -MetadataService.ERROR_0007_BAD_QUERY_DOMAIN=Could not get metadata domain for the query -MetadataService.ERROR_0007_BAD_JSON=Could not convert JSON to java object: {0} -MetadataService.ERROR_0008_BAD_QUERY=Could not create metadata query object - -SolutionRepo.ERROR_0001_NO_FILEPATH=No 'filepath' parameter provided -SolutionRepo.ERROR_0002_NO_STATE=No 'state' parameter provided -SolutionRepo.ERROR_0003_BAD_PATH=Filepath provided is invalid: {0} -SolutionRepo.ERROR_0004_CANNOT_REPLACE=File exists but 'replace' parameter was not set -SolutionRepo.ERROR_0005_CREDENTIALS=Invalid credentials -SolutionRepo.ERROR_0006_SAVE_FAILED=Could not save file to repository -SolutionRepo.ERROR_0007_NO_TYPE='TYPE' \u30d1\u30e9\u30e1\u30fc\u30bf\u30fc\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002 -SolutionRepo.ERROR_0008_LOAD_FAILED=File load failed (missing or invalid file): {0} -SolutionRepo.ERROR_0009_BAD_STATE=\u30b9\u30c6\u30fc\u30c8\u306f\u6709\u52b9\u306a XML \u3067\u306f\u3042\u308a\u307e\u305b\u3093: {0} -SolutionRepo.USER_FILE_SAVE=File saved successfully - SolutionURLContentGenerator.ERROR_0001_NO_FILEPATH=No 'path' parameter provided SolutionURLContentGenerator.ERROR_0002_CANNOT_HANDLE_TYPE=Invalid content type: {0} SolutionURLContentGenerator.ERROR_0003_RESOURCE_NOT_FOUND=Resource not found: {0} diff --git a/impl/server/src/main/resources/org/pentaho/common/ui/messages/messages_zh_CN.properties b/impl/server/src/main/resources/org/pentaho/common/ui/messages/messages_zh_CN.properties index 63cb309772..01780ee8dc 100644 --- a/impl/server/src/main/resources/org/pentaho/common/ui/messages/messages_zh_CN.properties +++ b/impl/server/src/main/resources/org/pentaho/common/ui/messages/messages_zh_CN.properties @@ -5,30 +5,6 @@ # Copyright (C) 2018 by Hitachi Vantara : http://www.pentaho.com # ******************************************************************************* # -UserSettingService.ERROR_0002_SETTINGS_READ=\u65e0\u6cd5\u8bfb\u53d6\u7528\u6237\u8bbe\u7f6e\uff1a{0} -UserSettingService.ERROR_0003_SETTINGS_WRITE=\u65e0\u6cd5\u5199\u5165\u7528\u6237\u8bbe\u7f6e\uff1a{0} - -MetadataService.ERROR_0001_BAD_REPO=Error getting metadata repository -MetadataService.ERROR_0002_BAD_MODEL_LIST=Error getting list of metadata models -MetadataService.ERROR_0003_NULL_DOMAIN=Domain id cannot be null -MetadataService.ERROR_0004_NULL_Model=Model id cannot be null -MetadataService.ERROR_0005_DOMAIN_NOT_FOUND=Domain cannot be found or loaded: {0} -MetadataService.ERROR_0006_MODEL_NOT_FOUND=Model cannot be found or loaded: {0} -MetadataService.ERROR_0007_JSON_ERROR=Could not create JSON object for result set -MetadataService.ERROR_0007_BAD_QUERY_DOMAIN=Could not get metadata domain for the query -MetadataService.ERROR_0007_BAD_JSON=Could not convert JSON to java object: {0} -MetadataService.ERROR_0008_BAD_QUERY=Could not create metadata query object - -SolutionRepo.ERROR_0001_NO_FILEPATH=\u672a\u63d0\u4f9b\u201cfilepath'\u201d\u53c2\u6570 -SolutionRepo.ERROR_0002_NO_STATE=\u672a\u63d0\u4f9b\u201cstate\u201d\u53c2\u6570 -SolutionRepo.ERROR_0003_BAD_PATH=\u63d0\u4f9b\u7684\u6587\u4ef6\u8def\u5f84\u65e0\u6548\uff1a{0} -SolutionRepo.ERROR_0004_CANNOT_REPLACE=\u6587\u4ef6\u5b58\u5728\u4f46\u672a\u8bbe\u7f6e\u201creplace\u201d\u53c2\u6570 -SolutionRepo.ERROR_0005_CREDENTIALS=\u65e0\u6548\u51ed\u636e -SolutionRepo.ERROR_0006_SAVE_FAILED=\u65e0\u6cd5\u5c06\u6587\u4ef6\u4fdd\u5b58\u5230\u5b58\u50a8\u5e93 -SolutionRepo.ERROR_0007_NO_TYPE=\u672a\u63d0\u4f9b\u201cTYPE\u201d\u53c2\u6570 -SolutionRepo.ERROR_0008_LOAD_FAILED=\u6587\u4ef6\u52a0\u8f7d\u5931\u8d25\uff08\u6587\u4ef6\u4e22\u5931\u6216\u65e0\u6548\uff09\uff1a{0} -SolutionRepo.ERROR_0009_BAD_STATE=\u72b6\u6001\u4e0d\u662f\u6709\u6548 xml\uff1a{0} -SolutionRepo.USER_FILE_SAVE=\u6587\u4ef6\u5df2\u6210\u529f\u4fdd\u5b58 SolutionURLContentGenerator.ERROR_0001_NO_FILEPATH=No 'path' parameter provided SolutionURLContentGenerator.ERROR_0002_CANNOT_HANDLE_TYPE=Invalid content type: {0} diff --git a/impl/server/src/test/java/org/pentaho/common/ui/TestUserSettingService.java b/impl/server/src/test/java/org/pentaho/common/ui/TestUserSettingService.java deleted file mode 100644 index d8e09c5511..0000000000 --- a/impl/server/src/test/java/org/pentaho/common/ui/TestUserSettingService.java +++ /dev/null @@ -1,87 +0,0 @@ -/*! - * This program is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License, version 2.1 as published by the Free Software - * Foundation. - * - * You should have received a copy of the GNU Lesser General Public License along with this - * program; if not, you can obtain a copy at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html - * or from the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU Lesser General Public License for more details. - * - * Copyright (c) 2002-2017 Hitachi Vantara.. All rights reserved. - */ - -package org.pentaho.common.ui; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.pentaho.platform.api.engine.IPentahoSession; -import org.pentaho.platform.api.usersettings.IUserSettingService; -import org.pentaho.platform.api.usersettings.pojo.IUserSetting; -import org.pentaho.platform.repository.usersettings.pojo.UserSetting; - -public class TestUserSettingService implements IUserSettingService { - - private Map settings = new HashMap(); - - @Override - public void deleteUserSettings() { - // TODO Auto-generated method stub - settings.clear(); - } - - @Override - public IUserSetting getGlobalUserSetting( String arg0, String arg1 ) { - // TODO Auto-generated method stub - return null; - } - - @Override - public List getGlobalUserSettings() { - // TODO Auto-generated method stub - return null; - } - - @Override - public IUserSetting getUserSetting( String arg0, String arg1 ) { - - return settings.get( arg0 ); - } - - @Override - public List getUserSettings() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void setGlobalUserSetting( String arg0, String arg1 ) { - // TODO Auto-generated method stub - - } - - @Override - public void setUserSetting( String settingName, String settingValue ) { - - if ( settingValue.equals( "error" ) ) { //$NON-NLS-1$ - // generate an error - throw new IllegalArgumentException(); - } - - UserSetting setting = new UserSetting( 0, 0, "", settingName, settingValue ); //$NON-NLS-1$ - settings.put( settingName, setting ); - } - - @Override - public void init( IPentahoSession arg0 ) { - // TODO Auto-generated method stub - - } - -} diff --git a/impl/server/src/test/java/org/pentaho/common/ui/metadata/service/MetadataService2Test.java b/impl/server/src/test/java/org/pentaho/common/ui/metadata/service/MetadataService2Test.java deleted file mode 100644 index dbef047a08..0000000000 --- a/impl/server/src/test/java/org/pentaho/common/ui/metadata/service/MetadataService2Test.java +++ /dev/null @@ -1,302 +0,0 @@ -/*! - * This program is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License, version 2.1 as published by the Free Software - * Foundation. - * - * You should have received a copy of the GNU Lesser General Public License along with this - * program; if not, you can obtain a copy at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html - * or from the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU Lesser General Public License for more details. - * - * Copyright (c) 2002-2017 Hitachi Vantara.. All rights reserved. - */ - -package org.pentaho.common.ui.metadata.service; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.apache.commons.lang.StringUtils; -import org.junit.Before; -import org.junit.Test; -import org.pentaho.commons.connection.IPentahoMetaData; -import org.pentaho.commons.connection.IPentahoResultSet; -import org.pentaho.commons.connection.marshal.MarshallableResultSet; -import org.pentaho.metadata.datatable.DataTable; -import org.pentaho.metadata.model.Domain; -import org.pentaho.metadata.model.LogicalModel; -import org.pentaho.metadata.model.concept.types.LocalizedString; -import org.pentaho.metadata.model.thin.Model; -import org.pentaho.metadata.model.thin.ModelInfo; -import org.pentaho.metadata.model.thin.Query; -import org.pentaho.metadata.query.model.util.QueryXmlHelper; -import org.pentaho.metadata.repository.IMetadataDomainRepository; - -public class MetadataService2Test { - - private static final String DEFAULT_LOCALE = "en"; - private static final String[] DEFAULT_LOCALES_CODES = new String[] { DEFAULT_LOCALE }; - - private static final String PROVIDER_ID = "provider_id"; - private static final String DOMAIN_NAME = "testDomain"; - private static final String MODEL_ID = "visibleModelId"; - // private static final String CTX = "testContext"; - private static final String MATCH = "match"; - - private MetadataService2 metadataService; - - private IMetadataDomainRepository mockDomainRepo; - private LogicalModel visibleModel; - private Domain validDomain; - private MetadataServiceUtil2 util2; - private QueryXmlHelper helper; - - @Before - public void setUp() throws Exception { - metadataService = spy( new MetadataService2() ); - - mockDomainRepo = mock( IMetadataDomainRepository.class ); - - visibleModel = mock( LogicalModel.class ); - // doReturn( "testCtx0," + CTX ).when( visibleModel ).getProperty( "visible" ); - doReturn( MODEL_ID ).when( visibleModel ).getId(); - doReturn( "visibleModelName" ).when( visibleModel ).getName( DEFAULT_LOCALE ); - doReturn( new LocalizedString() ).when( visibleModel ).getDescription(); - doReturn( "visibleModelDescLocale" ).when( visibleModel ).getDescription( DEFAULT_LOCALE ); - - LogicalModel invisibleModel = mock( LogicalModel.class ); - doReturn( "testCtx0,testCtx1" ).when( invisibleModel ).getProperty( "visible" ); - - List listModels = new ArrayList( 2 ); - listModels.add( visibleModel ); - listModels.add( invisibleModel ); - - validDomain = mock( Domain.class ); - doReturn( listModels ).when( validDomain ).getLogicalModels(); - doReturn( DEFAULT_LOCALES_CODES ).when( validDomain ).getLocaleCodes(); - doReturn( visibleModel ).when( validDomain ).findLogicalModel( MODEL_ID ); - doReturn( validDomain ).when( mockDomainRepo ).getDomain( DOMAIN_NAME ); - Set domainIds = new HashSet(); - domainIds.add( DOMAIN_NAME ); - doReturn( domainIds ).when( mockDomainRepo ).getDomainIds(); - doReturn( mockDomainRepo ).when( metadataService ).getMetadataRepository(); - - util2 = mock( MetadataServiceUtil2.class ); - doReturn( util2 ).when( metadataService ).getMetadataServiceUtil2(); - - helper = mock( QueryXmlHelper.class ); - doReturn( helper ).when( metadataService ).getHelper(); - } - - @Test - public void testGetModelListWithoutDefaultProvider() throws Exception { - ModelInfo[] result = metadataService.getModelList( "incorrecrProvider", StringUtils.EMPTY, MATCH ); - assertEquals( 0, result.length ); - } - - @Test - public void testGetModelListWithoutRepository() throws Exception { - doReturn( null ).when( metadataService ).getMetadataRepository(); - ModelInfo[] result = metadataService.getModelList( MetadataService2.PROVIDER_ID, StringUtils.EMPTY, MATCH ); - assertNull( result ); - } - - @Test - public void testListBusinessModelsWithoutDomainName() throws Exception { - ModelInfo[] result = metadataService.getModelList( MetadataService2.PROVIDER_ID, StringUtils.EMPTY, MATCH ); - assertNotNull( result ); - assertEquals( 1, result.length ); - assertEquals( DOMAIN_NAME, result[0].getGroupId() ); - assertEquals( visibleModel.getId(), result[0].getModelId() ); - assertEquals( visibleModel.getName( DEFAULT_LOCALE ), result[0].getName() ); - assertEquals( visibleModel.getDescription( DEFAULT_LOCALE ), result[0].getDescription() ); - } - - @Test - public void testListBusinessModels() throws Exception { - ModelInfo[] result = metadataService.getModelList( MetadataService2.PROVIDER_ID, DOMAIN_NAME, MATCH ); - assertNotNull( result ); - assertEquals( 1, result.length ); - assertEquals( DOMAIN_NAME, result[0].getGroupId() ); - assertEquals( visibleModel.getId(), result[0].getModelId() ); - assertEquals( visibleModel.getName( DEFAULT_LOCALE ), result[0].getName() ); - assertEquals( visibleModel.getDescription( DEFAULT_LOCALE ), result[0].getDescription() ); - } - - @Test - public void testGetModel() { - Model model = metadataService.getModel( PROVIDER_ID ); - assertNull( model ); - - model = metadataService.getModel( PROVIDER_ID + "~" + DOMAIN_NAME ); - assertNull( model ); - - model = metadataService.getModel( PROVIDER_ID + "~invalid_domain~invalid_model" ); - assertNull( model ); - - model = metadataService.getModel( PROVIDER_ID + "~" + DOMAIN_NAME + "~invalid_model" ); - assertNull( model ); - - Model mockModel = mock( Model.class ); - doReturn( mockModel ).when( util2 ).createThinModel( visibleModel, DOMAIN_NAME ); - model = metadataService.getModel( PROVIDER_ID + "~" + DOMAIN_NAME + "~" + MODEL_ID ); - assertEquals( mockModel, model ); - } - - @Test - public void testExecuteQuery() { - Query query = mock( Query.class ); - DataTable result = metadataService.executeQuery( query, 10 ); - assertNull( result ); - } - - @Test - public void testDoQuery() { - Integer rowLimit = new Integer( 10 ); - String xml = "xml"; - String sourceId = "sourceId"; - Query query = mock( Query.class ); - doReturn( sourceId ).when( query ).getSourceId(); - MarshallableResultSet mockRS = mock( MarshallableResultSet.class ); - org.pentaho.metadata.query.model.Query mockQuery = mock( org.pentaho.metadata.query.model.Query.class ); - Model model = mock( Model.class ); - doReturn( mockQuery ).when( util2 ).convertQuery( query, model ); - doReturn( xml ).when( helper ).toXML( mockQuery ); - doReturn( model ).when( metadataService ).getModel( sourceId ); - doReturn( mockRS ).when( metadataService ).doXmlQuery( xml, rowLimit ); - - MarshallableResultSet result = metadataService.doQuery( query, rowLimit ); - assertEquals( mockRS, result ); - } - - @Test - public void testDoXmlQuery() { - Integer rowLimit = new Integer( 10 ); - String xml = "xml"; - - doReturn( null ).when( metadataService ).executeQuery( xml, rowLimit ); - MarshallableResultSet result = metadataService.doXmlQuery( xml, rowLimit ); - assertNull( result ); - - IPentahoMetaData mockedMetadata = mock( IPentahoMetaData.class ); - doReturn( new Object[][] { { "tt" } } ).when( mockedMetadata ).getColumnHeaders(); - IPentahoResultSet mockedResult = mock( IPentahoResultSet.class ); - doReturn( 1 ).when( mockedResult ).getColumnCount(); - doReturn( 1 ).when( mockedResult ).getRowCount(); - doReturn( null ).when( mockedResult ).next(); - doReturn( mockedMetadata ).when( mockedResult ).getMetaData(); - - doReturn( mockedResult ).when( metadataService ).executeQuery( xml, rowLimit ); - result = metadataService.doXmlQuery( xml, rowLimit ); - assertNotNull( result ); - assertEquals( 0, result.getNumColumnHeaderSets() ); - assertEquals( 0, result.getNumRowHeaderSets() ); - assertEquals( "tt", result.getColumnNames().getColumnName()[0] ); - } - - @Test - public void testDoXmlQueryToJson() { - Integer rowLimit = new Integer( 10 ); - String xml = "xml"; - - doReturn( null ).when( metadataService ).doXmlQuery( xml, rowLimit ); - String result = metadataService.doXmlQueryToJson( xml, rowLimit ); - assertNull( result ); - - MarshallableResultSet resultSet = new MarshallableResultSet(); - resultSet.setNumColumnHeaderSets( 2 ); - resultSet.setNumRowHeaderSets( 1 ); - doReturn( resultSet ).when( metadataService ).doXmlQuery( xml, rowLimit ); - result = metadataService.doXmlQueryToJson( xml, rowLimit ); - assertNotNull( result ); - } - - @Test - public void testDoXmlQueryToCdaJson() throws Exception { - Integer rowLimit = new Integer( 10 ); - String xml = "xml"; - String json = "json"; - - doReturn( null ).when( metadataService ).executeQuery( xml, rowLimit ); - String result = metadataService.doXmlQueryToCdaJson( xml, rowLimit ); - assertNull( result ); - - IPentahoResultSet mockedResult = mock( IPentahoResultSet.class ); - doReturn( mockedResult ).when( metadataService ).executeQuery( xml, rowLimit ); - doReturn( validDomain ).when( util2 ).getDomainObject( xml ); - doReturn( json ).when( util2 ).createCdaJson( mockedResult, DEFAULT_LOCALE ); - result = metadataService.doXmlQueryToCdaJson( xml, rowLimit ); - assertEquals( json, result ); - } - - @Test - public void testDoJsonQuery() { - Integer rowLimit = new Integer( 10 ); - String json = "json"; - String query = "query"; - - MarshallableResultSet rs = mock( MarshallableResultSet.class ); - doReturn( query ).when( metadataService ).getQueryXmlFromJson( json ); - doReturn( rs ).when( metadataService ).doXmlQuery( query, rowLimit ); - MarshallableResultSet result = metadataService.doJsonQuery( json, rowLimit ); - assertEquals( rs, result ); - } - - @Test - public void testDoJsonQueryToJson() { - Integer rowLimit = new Integer( 10 ); - String json = "json"; - String query = "query"; - String rs = "result"; - - doReturn( query ).when( metadataService ).getQueryXmlFromJson( json ); - doReturn( rs ).when( metadataService ).doXmlQueryToJson( query, rowLimit ); - String result = metadataService.doJsonQueryToJson( json, rowLimit ); - assertEquals( rs, result ); - } - - @Test - public void testDoJsonQueryToCdaJson() { - Integer rowLimit = new Integer( 10 ); - String json = "json"; - String query = "query"; - String rs = "result"; - - doReturn( query ).when( metadataService ).getQueryXmlFromJson( json ); - doReturn( rs ).when( metadataService ).doXmlQueryToCdaJson( query, rowLimit ); - String result = metadataService.doJsonQueryToCdaJson( json, rowLimit ); - assertEquals( rs, result ); - } - - @Test - public void testGetQueryXmlFromJson() { - String json = "json"; - String resultXml = "result"; - String sourceId = "sourceId"; - - Query query = mock( Query.class ); - doReturn( sourceId ).when( query ).getSourceId(); - Model model = mock( Model.class ); - org.pentaho.metadata.query.model.Query modelQuery = mock( org.pentaho.metadata.query.model.Query.class ); - doReturn( query ).when( util2 ).deserializeJsonQuery( json ); - doReturn( modelQuery ).when( util2 ).convertQuery( query, model ); - doReturn( resultXml ).when( helper ).toXML( modelQuery ); - doReturn( model ).when( metadataService ).getModel( sourceId ); - - String result = metadataService.getQueryXmlFromJson( json ); - assertEquals( resultXml, result ); - } -} diff --git a/impl/server/src/test/java/org/pentaho/common/ui/metadata/service/MetadataServiceTest.java b/impl/server/src/test/java/org/pentaho/common/ui/metadata/service/MetadataServiceTest.java deleted file mode 100644 index 07332fd88d..0000000000 --- a/impl/server/src/test/java/org/pentaho/common/ui/metadata/service/MetadataServiceTest.java +++ /dev/null @@ -1,329 +0,0 @@ -/*! - * This program is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License, version 2.1 as published by the Free Software - * Foundation. - * - * You should have received a copy of the GNU Lesser General Public License along with this - * program; if not, you can obtain a copy at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html - * or from the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU Lesser General Public License for more details. - * - * Copyright (c) 2002-2017 Hitachi Vantara.. All rights reserved. - */ - -package org.pentaho.common.ui.metadata.service; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.apache.commons.lang.StringUtils; -import org.junit.Before; -import org.junit.Test; -import org.pentaho.common.ui.metadata.model.impl.Model; -import org.pentaho.common.ui.metadata.model.impl.ModelInfo; -import org.pentaho.common.ui.metadata.model.impl.Query; -import org.pentaho.commons.connection.IPentahoMetaData; -import org.pentaho.commons.connection.IPentahoResultSet; -import org.pentaho.commons.connection.marshal.MarshallableResultSet; -import org.pentaho.metadata.model.Domain; -import org.pentaho.metadata.model.LogicalModel; -import org.pentaho.metadata.model.concept.types.LocalizedString; -import org.pentaho.metadata.query.model.util.QueryXmlHelper; -import org.pentaho.metadata.repository.IMetadataDomainRepository; - -public class MetadataServiceTest { - - private static final String DEFAULT_LOCALE = "en"; - private static final String[] DEFAULT_LOCALES_CODES = new String[] { DEFAULT_LOCALE }; - - private static final String DOMAIN_NAME = "testDomain"; - private static final String MODEL_ID = "visibleModelId"; - private static final String MODEL_NAME = " visibleModelName"; - private static final String MODEL_ID_XSS = "zModelId_XSS"; - private static final String CTX = "testContext"; - private static final String XSS_STRING = ""; - - - private MetadataService metadataService; - - private IMetadataDomainRepository mockDomainRepo; - private LogicalModel visibleModel; - private Domain validDomain; - private MetadataServiceUtil util; - private MetadataServiceUtil2 util2; - private QueryXmlHelper helper; - - @Before - public void setUp() throws Exception { - metadataService = spy( new MetadataService() ); - - mockDomainRepo = mock( IMetadataDomainRepository.class ); - - visibleModel = mock( LogicalModel.class ); - doReturn( "testCtx0," + CTX ).when( visibleModel ).getProperty( "visible" ); - doReturn( MODEL_ID ).when( visibleModel ).getId(); - doReturn( MODEL_NAME ).when( visibleModel ).getName( DEFAULT_LOCALE ); - doReturn( new LocalizedString() ).when( visibleModel ).getDescription(); - doReturn( "visibleModelDescLocale" ).when( visibleModel ).getDescription( DEFAULT_LOCALE ); - LogicalModel visibleModel2 = mock( LogicalModel.class ); - doReturn( "testCtx0," + CTX ).when( visibleModel2 ).getProperty( "visible" ); - doReturn( MODEL_ID_XSS ).when( visibleModel2 ).getId(); - doReturn( XSS_STRING ).when( visibleModel2 ).getName( DEFAULT_LOCALE ); - doReturn( new LocalizedString() ).when( visibleModel2 ).getDescription(); - doReturn( "visibleModelDescLocale" ).when( visibleModel2 ).getDescription( DEFAULT_LOCALE ); - - LogicalModel invisibleModel = mock( LogicalModel.class ); - doReturn( "testCtx0,testCtx1" ).when( invisibleModel ).getProperty( "visible" ); - - List listModels = new ArrayList( 2 ); - listModels.add( visibleModel ); - listModels.add( invisibleModel ); - listModels.add( visibleModel2 ); - - validDomain = mock( Domain.class ); - doReturn( listModels ).when( validDomain ).getLogicalModels(); - doReturn( DEFAULT_LOCALES_CODES ).when( validDomain ).getLocaleCodes(); - doReturn( visibleModel ).when( validDomain ).findLogicalModel( MODEL_ID ); - doReturn( validDomain ).when( mockDomainRepo ).getDomain( DOMAIN_NAME ); - Set domainIds = new HashSet(); - domainIds.add( DOMAIN_NAME ); - doReturn( domainIds ).when( mockDomainRepo ).getDomainIds(); - doReturn( mockDomainRepo ).when( metadataService ).getMetadataRepository(); - - util = mock( MetadataServiceUtil.class ); - doReturn( util ).when( metadataService ).getMetadataServiceUtil(); - - util2 = mock( MetadataServiceUtil2.class ); - doReturn( util2 ).when( metadataService ).getMetadataServiceUtil2(); - - helper = mock( QueryXmlHelper.class ); - doReturn( helper ).when( metadataService ).getHelper(); - } - - @Test - public void testListBusinessModelsWithoutRepository() throws Exception { - doReturn( null ).when( metadataService ).getMetadataRepository(); - ModelInfo[] result = metadataService.listBusinessModels( StringUtils.EMPTY, StringUtils.EMPTY ); - assertNull( result ); - } - - @Test - public void testListBusinessModelsWithoutDomainName() throws Exception { - ModelInfo[] result = metadataService.listBusinessModels( StringUtils.EMPTY, CTX ); - assertNotNull( result ); - assertEquals( 2, result.length ); - assertEquals( DOMAIN_NAME, result[0].getDomainId() ); - assertEquals( visibleModel.getId(), result[0].getModelId() ); - assertEquals( visibleModel.getName( DEFAULT_LOCALE ), result[0].getModelName() ); - assertEquals( visibleModel.getDescription( DEFAULT_LOCALE ), result[0].getModelDescription() ); - } - - @Test - public void testListBusinessModels() throws Exception { - ModelInfo[] result = metadataService.listBusinessModels( DOMAIN_NAME, CTX ); - assertNotNull( result ); - assertEquals( 2, result.length ); - assertEquals( DOMAIN_NAME, result[0].getDomainId() ); - assertEquals( visibleModel.getId(), result[0].getModelId() ); - assertEquals( visibleModel.getName( DEFAULT_LOCALE ), result[0].getModelName() ); - assertEquals( visibleModel.getDescription( DEFAULT_LOCALE ), result[0].getModelDescription() ); - } - - @Test - public void testListBusinessModelsJson() throws IOException { - String json = metadataService.listBusinessModelsJson( DOMAIN_NAME, CTX ); - assertEquals( - "[{\"class\":\"org.pentaho.common.ui.metadata.model.impl.ModelInfo\",\"domainId\":\"testDomain\",\"modelDescription\":\"visibleModelDescLocale\",\"modelId\":\"visibleModelId\",\"modelName\":\" visibleModelName\"},{\"class\":\"org.pentaho.common.ui.metadata.model.impl.ModelInfo\",\"domainId\":\"testDomain\",\"modelDescription\":\"visibleModelDescLocale\",\"modelId\":\"zModelId_XSS\",\"modelName\":\"<iMg SrC=x OnErRoR=alert(11113)>\"}]", - json ); - } - - @Test - public void testLoadModel() { - Model model = metadataService.loadModel( null, null ); - assertNull( model ); - - model = metadataService.loadModel( DOMAIN_NAME, null ); - assertNull( model ); - - model = metadataService.loadModel( "invalid_domain", "invalid_model" ); - assertNull( model ); - - model = metadataService.loadModel( DOMAIN_NAME, "invalid_model" ); - assertNull( model ); - - Model mockModel = mock( Model.class ); - doReturn( mockModel ).when( util ).createThinModel( visibleModel, DOMAIN_NAME ); - model = metadataService.loadModel( DOMAIN_NAME, MODEL_ID ); - assertEquals( mockModel, model ); - } - - @Test - public void testLoadModelJson() { - String dId = "dom_id"; - String mId = "model_id"; - Model model = new Model(); - model.setId( mId ); - model.setName( "name" ); - model.setDomainId( dId ); - doReturn( model ).when( metadataService ).loadModel( dId, mId ); - - String json = metadataService.loadModelJson( dId, mId ); - assertEquals( - "{\"categories\":[],\"class\":\"org.pentaho.common.ui.metadata.model.impl.Model\",\"description\":null,\"domainId\":\"dom_id\",\"id\":\"model_id\",\"name\":\"name\"}", - json ); - } - - @Test - public void testDoQuery() { - Integer rowLimit = new Integer( 10 ); - String xml = "xml"; - Query query = mock( Query.class ); - MarshallableResultSet mockRS = mock( MarshallableResultSet.class ); - org.pentaho.metadata.query.model.Query mockQuery = mock( org.pentaho.metadata.query.model.Query.class ); - doReturn( mockQuery ).when( util ).convertQuery( query ); - doReturn( xml ).when( helper ).toXML( mockQuery ); - doReturn( mockRS ).when( metadataService ).doXmlQuery( xml, rowLimit ); - - MarshallableResultSet result = metadataService.doQuery( query, rowLimit ); - assertEquals( mockRS, result ); - } - - @Test - public void testDoXmlQuery() { - Integer rowLimit = new Integer( 10 ); - String xml = "xml"; - - doReturn( null ).when( metadataService ).executeQuery( xml, rowLimit ); - MarshallableResultSet result = metadataService.doXmlQuery( xml, rowLimit ); - assertNull( result ); - - IPentahoMetaData mockedMetadata = mock( IPentahoMetaData.class ); - doReturn( new Object[][] { { "tt" } } ).when( mockedMetadata ).getColumnHeaders(); - IPentahoResultSet mockedResult = mock( IPentahoResultSet.class ); - doReturn( 1 ).when( mockedResult ).getColumnCount(); - doReturn( 1 ).when( mockedResult ).getRowCount(); - doReturn( null ).when( mockedResult ).next(); - doReturn( mockedMetadata ).when( mockedResult ).getMetaData(); - - doReturn( mockedResult ).when( metadataService ).executeQuery( xml, rowLimit ); - result = metadataService.doXmlQuery( xml, rowLimit ); - assertNotNull( result ); - assertEquals( 0, result.getNumColumnHeaderSets() ); - assertEquals( 0, result.getNumRowHeaderSets() ); - assertEquals( "tt", result.getColumnNames().getColumnName()[0] ); - } - - @Test - public void testDoXmlQueryToJson() { - Integer rowLimit = new Integer( 10 ); - String xml = "xml"; - - doReturn( null ).when( metadataService ).doXmlQuery( xml, rowLimit ); - String result = metadataService.doXmlQueryToJson( xml, rowLimit ); - assertNull( result ); - - MarshallableResultSet resultSet = new MarshallableResultSet(); - resultSet.setNumColumnHeaderSets( 2 ); - resultSet.setNumRowHeaderSets( 1 ); - doReturn( resultSet ).when( metadataService ).doXmlQuery( xml, rowLimit ); - result = metadataService.doXmlQueryToJson( xml, rowLimit ); - assertNotNull( result ); - } - - @Test - public void testDoXmlQueryToCdaJson() throws Exception { - Integer rowLimit = new Integer( 10 ); - String xml = "xml"; - String json = "json"; - - doReturn( null ).when( metadataService ).executeQuery( xml, rowLimit ); - String result = metadataService.doXmlQueryToCdaJson( xml, rowLimit ); - assertNull( result ); - - IPentahoResultSet mockedResult = mock( IPentahoResultSet.class ); - doReturn( mockedResult ).when( metadataService ).executeQuery( xml, rowLimit ); - doReturn( validDomain ).when( util2 ).getDomainObject( xml ); - doReturn( json ).when( util2 ).createCdaJson( mockedResult, DEFAULT_LOCALE ); - result = metadataService.doXmlQueryToCdaJson( xml, rowLimit ); - assertEquals( json, result ); - } - - @Test - public void testDoJsonQuery() { - Integer rowLimit = new Integer( 10 ); - String json = "json"; - String query = "query"; - - MarshallableResultSet rs = mock( MarshallableResultSet.class ); - doReturn( query ).when( metadataService ).getQueryXmlFromJson( json ); - doReturn( rs ).when( metadataService ).doXmlQuery( query, rowLimit ); - MarshallableResultSet result = metadataService.doJsonQuery( json, rowLimit ); - assertEquals( rs, result ); - } - - @Test - public void testDoJsonQueryToJson() { - Integer rowLimit = new Integer( 10 ); - String json = "json"; - String query = "query"; - String rs = "result"; - - doReturn( query ).when( metadataService ).getQueryXmlFromJson( json ); - doReturn( rs ).when( metadataService ).doXmlQueryToJson( query, rowLimit ); - String result = metadataService.doJsonQueryToJson( json, rowLimit ); - assertEquals( rs, result ); - } - - @Test - public void testDoJsonQueryToCdaJson() { - Integer rowLimit = new Integer( 10 ); - String json = "json"; - String query = "query"; - String rs = "result"; - - doReturn( query ).when( metadataService ).getQueryXmlFromJson( json ); - doReturn( rs ).when( metadataService ).doXmlQueryToCdaJson( query, rowLimit ); - String result = metadataService.doJsonQueryToCdaJson( json, rowLimit ); - assertEquals( rs, result ); - } - - @Test - public void testGetQueryXmlFromJson() { - String json = "json"; - String resultXml = "result"; - - Query query = mock( Query.class ); - org.pentaho.metadata.query.model.Query modelQuery = mock( org.pentaho.metadata.query.model.Query.class ); - doReturn( query ).when( util ).deserializeJsonQuery( json ); - doReturn( modelQuery ).when( util ).convertQuery( query ); - doReturn( resultXml ).when( helper ).toXML( modelQuery ); - - String result = metadataService.getQueryXmlFromJson( json ); - assertEquals( resultXml, result ); - } - - @Test - public void testListBusinessModelsXSS() throws Exception { - ModelInfo[] result = metadataService.listBusinessModels( DOMAIN_NAME, CTX ); - assertNotNull( result ); - assertEquals( 2, result.length ); - assertFalse( XSS_STRING.equals( result[1].getModelName() ) ); - assertFalse( result[1].getModelName().contains( "<" ) ); - } -} diff --git a/impl/server/src/test/java/org/pentaho/common/ui/metadata/service/MetadataServiceUtil2Test.java b/impl/server/src/test/java/org/pentaho/common/ui/metadata/service/MetadataServiceUtil2Test.java deleted file mode 100644 index 8057225cfb..0000000000 --- a/impl/server/src/test/java/org/pentaho/common/ui/metadata/service/MetadataServiceUtil2Test.java +++ /dev/null @@ -1,348 +0,0 @@ -/*! - * This program is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License, version 2.1 as published by the Free Software - * Foundation. - * - * You should have received a copy of the GNU Lesser General Public License along with this - * program; if not, you can obtain a copy at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html - * or from the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU Lesser General Public License for more details. - * - * Copyright (c) 2002-2017 Hitachi Vantara.. All rights reserved. - */ - -package org.pentaho.common.ui.metadata.service; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.pentaho.commons.connection.IPentahoMetaData; -import org.pentaho.commons.connection.IPentahoResultSet; -import org.pentaho.metadata.model.Category; -import org.pentaho.metadata.model.Domain; -import org.pentaho.metadata.model.IPhysicalColumn; -import org.pentaho.metadata.model.LogicalColumn; -import org.pentaho.metadata.model.LogicalModel; -import org.pentaho.metadata.model.concept.Concept; -import org.pentaho.metadata.model.concept.types.AggregationType; -import org.pentaho.metadata.model.concept.types.Alignment; -import org.pentaho.metadata.model.concept.types.DataType; -import org.pentaho.metadata.model.concept.types.FieldType; -import org.pentaho.metadata.model.concept.types.LocalizedString; -import org.pentaho.metadata.model.thin.Condition; -import org.pentaho.metadata.model.thin.Element; -import org.pentaho.metadata.model.thin.Model; -import org.pentaho.metadata.model.thin.ModelInfo; -import org.pentaho.metadata.model.thin.Order; -import org.pentaho.metadata.model.thin.Parameter; -import org.pentaho.metadata.model.thin.Query; -import org.pentaho.metadata.query.model.CombinationType; -import org.pentaho.metadata.query.model.Constraint; -import org.pentaho.metadata.query.model.Order.Type; -import org.pentaho.metadata.query.model.Selection; -import org.pentaho.metadata.repository.IMetadataDomainRepository; - -public class MetadataServiceUtil2Test { - - private static final String DEFAULT_LOCALE = "en"; - private static final String DOMAIN_ID = "domain_id"; - - private MetadataServiceUtil2 spyMetadataServiceUtil = spy( new MetadataServiceUtil2() ); - - @Before - public void setUp() { - doReturn( DEFAULT_LOCALE ).when( spyMetadataServiceUtil ).getLocale(); - } - - @Test - public void testCreateThinModel() { - LogicalColumn column = - createMockColumn( "id_column", "name_column", "description_column", DataType.STRING, FieldType.ATTRIBUTE ); - List listColumns = new ArrayList( 1 ); - listColumns.add( column ); - Category category = createMockCategory( "id_category", "name_category", "description_category", listColumns ); - List listCategories = new ArrayList( 1 ); - listCategories.add( category ); - LogicalModel lmodel = createMockModel( "id", "name", "description", listCategories ); - - Model model = spyMetadataServiceUtil.createThinModel( lmodel, DOMAIN_ID ); - - assertModels( lmodel, model, DOMAIN_ID ); - assertEquals( 2, model.getElements().length ); - Element elemCat = model.getElements()[0]; - assertElements( category, elemCat ); - Element elemCol = model.getElements()[1]; - assertColumns( column, elemCol, category.getId() ); - } - - @Test - public void testCreateCdaJson() throws JSONException { - String result = spyMetadataServiceUtil.createCdaJson( null, DEFAULT_LOCALE ); - assertNull( result ); - - Object[][] headers = new Object[][] { { new String( "Header_0" ), new String( "Header_1" ) } }; - IPentahoMetaData mockMetaData = mock( IPentahoMetaData.class ); - doReturn( headers ).when( mockMetaData ).getColumnHeaders(); - doReturn( DataType.STRING ).when( mockMetaData ).getAttribute( 0, 0, IPhysicalColumn.DATATYPE_PROPERTY ); - doReturn( DataType.BOOLEAN ).when( mockMetaData ).getAttribute( 0, 1, IPhysicalColumn.DATATYPE_PROPERTY ); - doReturn( new LocalizedString( DEFAULT_LOCALE, "name_0" ) ).when( mockMetaData ).getAttribute( 0, 0, - Concept.NAME_PROPERTY ); - doReturn( new LocalizedString( DEFAULT_LOCALE, "name_1" ) ).when( mockMetaData ).getAttribute( 0, 1, - Concept.NAME_PROPERTY ); - IPentahoResultSet mockResultSet = mock( IPentahoResultSet.class ); - doReturn( 2 ).when( mockResultSet ).getColumnCount(); - doReturn( 2 ).when( mockResultSet ).getRowCount(); - doReturn( "val_00" ).when( mockResultSet ).getValueAt( 0, 0 ); - doReturn( "val_01" ).when( mockResultSet ).getValueAt( 0, 1 ); - doReturn( "val_10" ).when( mockResultSet ).getValueAt( 1, 0 ); - doReturn( "val_11" ).when( mockResultSet ).getValueAt( 1, 1 ); - doReturn( mockMetaData ).when( mockResultSet ).getMetaData(); - - result = spyMetadataServiceUtil.createCdaJson( mockResultSet, DEFAULT_LOCALE ); - assertNotNull( result ); - JSONObject resultObj = new JSONObject( result ); - assertTrue( resultObj.has( "metadata" ) ); - assertTrue( resultObj.has( "resultset" ) ); - JSONArray resultset = resultObj.getJSONArray( "resultset" ); - assertEquals( "[[\"val_00\",\"val_01\"],[\"val_10\",\"val_11\"]]", resultset.toString() ); - JSONArray metadata = resultObj.getJSONArray( "metadata" ); - makeMetadataObjectAssertions( metadata.getJSONObject( 0 ), 0, "STRING" ); - makeMetadataObjectAssertions( metadata.getJSONObject( 1 ), 1, "BOOLEAN" ); - } - - private void makeMetadataObjectAssertions( JSONObject obj, int idx, String type ) throws JSONException { - assertEquals( "name_" + idx, obj.getString( "colLabel" ) ); - assertEquals( idx, obj.getInt( "colIndex" ) ); - assertEquals( type, obj.getString( "colType" ) ); - assertEquals( "Header_" + idx, obj.getString( "colName" ) ); - } - - @Test - public void testConvertQuery() { - String domainName = "test_domain"; - String modelId = "model_id"; - String columnId = "column_id"; - LogicalColumn mockColumn = mock( LogicalColumn.class ); - doReturn( DataType.STRING ).when( mockColumn ).getDataType(); - doReturn( columnId ).when( mockColumn ).getId(); - LogicalModel mockModel = mock( LogicalModel.class ); - doReturn( mockColumn ).when( mockModel ).findLogicalColumn( columnId ); - Domain mockDomain = mock( Domain.class ); - doReturn( mockModel ).when( mockDomain ).findLogicalModel( modelId ); - IMetadataDomainRepository mockRepo = mock( IMetadataDomainRepository.class ); - doReturn( mockDomain ).when( mockRepo ).getDomain( domainName ); - org.pentaho.metadata.model.Category category = mock( org.pentaho.metadata.model.Category.class ); - doReturn( category ).when( spyMetadataServiceUtil ).getCategory( columnId, mockModel ); - doReturn( mockRepo ).when( spyMetadataServiceUtil ).getDomainRepository(); - - Query srcQuery = createMockQuery( domainName, modelId, columnId ); - ModelInfo info = new ModelInfo(); - info.setGroupId( domainName ); - info.setModelId( modelId ); - - org.pentaho.metadata.query.model.Query result = spyMetadataServiceUtil.convertQuery( srcQuery, info ); - - assertNotNull( result ); - assertEquals( mockDomain, result.getDomain() ); - assertFalse( result.getDisableDistinct() ); - assertEquals( mockModel, result.getLogicalModel() ); - assertEquals( 1, result.getSelections().size() ); - Selection selection = result.getSelections().get( 0 ); - assertEquals( mockColumn, selection.getLogicalColumn() ); - assertEquals( category, selection.getCategory() ); - assertEquals( AggregationType.SUM, selection.getActiveAggregationType() ); - assertEquals( AggregationType.SUM, selection.getAggregationType() ); - assertEquals( 1, result.getConstraints().size() ); - Constraint constraint = result.getConstraints().get( 0 ); - assertEquals( CombinationType.AND, constraint.getCombinationType() ); - assertNull( constraint.getFormula() ); - assertEquals( 1, result.getOrders().size() ); - org.pentaho.metadata.query.model.Order resOrder = result.getOrders().get( 0 ); - assertEquals( selection, resOrder.getSelection() ); - assertEquals( Type.ASC, resOrder.getType() ); - assertEquals( 1, result.getParameters().size() ); - org.pentaho.metadata.query.model.Parameter param = result.getParameters().get( 0 ); - assertEquals( "parameter_name", param.getName() ); - assertEquals( "val_0", param.getDefaultValue() ); - assertEquals( DataType.STRING, param.getType() ); - } - - @Test - public void testGetCategory() { - String columnId = "my_test_column_id"; - LogicalModel logicalModel = mock( LogicalModel.class ); - - doReturn( Collections.emptyList() ).when( logicalModel ).getCategories(); - Category result = spyMetadataServiceUtil.getCategory( columnId, logicalModel ); - assertNull( result ); - - LogicalColumn mockColumn = mock( LogicalColumn.class ); - Category mockCat1 = mock( Category.class ); - Category mockCat2 = mock( Category.class ); - doReturn( null ).when( mockCat1 ).findLogicalColumn( columnId ); - doReturn( mockColumn ).when( mockCat2 ).findLogicalColumn( columnId ); - List listCategories = new ArrayList( 2 ); - listCategories.add( mockCat1 ); - listCategories.add( mockCat2 ); - doReturn( listCategories ).when( logicalModel ).getCategories(); - result = spyMetadataServiceUtil.getCategory( columnId, logicalModel ); - assertEquals( mockCat2, result ); - } - - @Test - public void testDeserializeJsonQuery() { - String json = - "{\"class\":\"org.pentaho.metadata.model.thin.Query\",\"conditions\":[{\"class\":\"org.pentaho.metadata.model.thin.Condition\"," - + "\"combinationType\":\"AND\",\"elementId\":\"MY_ELEM_ID\",\"operator\":\"EQUAL\",\"parameterized\":false," - + "\"parentId\":\"MY_PARENT_ID\",\"selectedAggregation\":\"SUM\",\"value\":[ ]}],\"defaultParameterMap\":null," - + "\"disableDistinct\":false,\"elements\":[{\"availableAggregations\":null,\"capabilities\":null," - + "\"class\":\"org.pentaho.metadata.model.thin.Element\",\"dataType\":null,\"defaultAggregation\":\"NONE\"," - + "\"description\":null,\"elementType\":null,\"formatMask\":null,\"hiddenForUser\":false,\"horizontalAlignment\":\"LEFT\"," - + "\"id\":\"MY_ELEM_ID\",\"isQueryElement\":true,\"name\":null,\"parentId\":\"PARENT_ID\",\"selectedAggregation\":\"SUM\"}]," - + "\"orders\":[{\"class\":\"org.pentaho.metadata.model.thin.Order\",\"elementId\":\"MY_ELEM_ID\",\"orderType\":\"ASC\"," - + "\"parentId\":\"MY_PARENT_ID\"}],\"parameters\":[],\"sourceId\":\"MY_DOMAIN_ID\"}"; - Query result = spyMetadataServiceUtil.deserializeJsonQuery( json ); - assertNotNull( result ); - assertEquals( "MY_DOMAIN_ID", result.getSourceId() ); - assertFalse( result.getDisableDistinct() ); - assertEquals( 1, result.getElements().length ); - Element column = result.getElements()[0]; - assertEquals( "MY_ELEM_ID", column.getId() ); - assertNull( column.getName() ); - assertNull( column.getDescription() ); - assertNull( column.getElementType() ); - assertNull( column.getFormatMask() ); - assertNull( column.getDataType() ); - assertFalse( column.isHiddenForUser() ); - assertEquals( "NONE", column.getDefaultAggregation() ); - assertEquals( "PARENT_ID", column.getParentId() ); - assertEquals( "LEFT", column.getHorizontalAlignment() ); - assertEquals( "SUM", column.getSelectedAggregation() ); - assertEquals( 1, result.getConditions().length ); - Condition condition = result.getConditions()[0]; - assertEquals( "MY_PARENT_ID", condition.getParentId() ); - assertEquals( "MY_ELEM_ID", condition.getElementId() ); - assertEquals( "AND", condition.getCombinationType() ); - assertEquals( "EQUAL", condition.getOperator() ); - assertFalse( condition.isParameterized() ); - assertEquals( "SUM", condition.getSelectedAggregation() ); - Assert.assertArrayEquals( new String[] { }, condition.getValue() ); - assertEquals( 1, result.getOrders().length ); - Order order = result.getOrders()[0]; - assertEquals( "MY_ELEM_ID", order.getElementId() ); - assertEquals( "MY_PARENT_ID", order.getParentId() ); - assertEquals( "ASC", order.getOrderType() ); - assertEquals( 0, result.getParameters().length ); - } - - private LogicalColumn createMockColumn( String id, String name, String desc, DataType dataType, FieldType fieldType ) { - LogicalColumn column = mock( LogicalColumn.class ); - doReturn( name ).when( column ).getName( DEFAULT_LOCALE ); - doReturn( id ).when( column ).getId(); - doReturn( desc ).when( column ).getDescription( DEFAULT_LOCALE ); - doReturn( dataType ).when( column ).getDataType(); - doReturn( fieldType ).when( column ).getFieldType(); - List aggList = new ArrayList( 2 ); - aggList.add( AggregationType.SUM ); - aggList.add( AggregationType.COUNT ); - doReturn( aggList ).when( column ).getAggregationList(); - doReturn( AggregationType.AVERAGE ).when( column ).getAggregationType(); - doReturn( Alignment.LEFT ).when( column ).getProperty( "alignment" ); - doReturn( "test_mask" ).when( column ).getProperty( "mask" ); - doReturn( Boolean.FALSE ).when( column ).getProperty( "hidden" ); - return column; - } - - private Category createMockCategory( String id, String name, String desc, List columns ) { - Category category = mock( Category.class ); - doReturn( name ).when( category ).getName( DEFAULT_LOCALE ); - doReturn( id ).when( category ).getId(); - doReturn( desc ).when( category ).getDescription( DEFAULT_LOCALE ); - doReturn( columns ).when( category ).getLogicalColumns(); - return category; - } - - private LogicalModel createMockModel( String id, String name, String desc, List categories ) { - LogicalModel lmodel = mock( LogicalModel.class ); - doReturn( name ).when( lmodel ).getName( DEFAULT_LOCALE ); - doReturn( id ).when( lmodel ).getId(); - doReturn( desc ).when( lmodel ).getDescription( DEFAULT_LOCALE ); - doReturn( categories ).when( lmodel ).getCategories(); - return lmodel; - } - - private void assertColumns( LogicalColumn lcolumn, Element column, String categoryId ) { - assertEquals( lcolumn.getId(), column.getId() ); - assertEquals( lcolumn.getName( DEFAULT_LOCALE ), column.getName() ); - assertEquals( lcolumn.getDescription( DEFAULT_LOCALE ), column.getDescription() ); - assertEquals( categoryId, column.getParentId() ); - assertEquals( lcolumn.getDataType().getName().toUpperCase(), column.getDataType() ); - assertEquals( lcolumn.getFieldType().name(), column.getElementType() ); - Assert.assertArrayEquals( new String[] { "SUM", "COUNT", "AVERAGE" }, column.getAvailableAggregations() ); - assertEquals( lcolumn.getAggregationType().name(), column.getDefaultAggregation() ); - assertEquals( lcolumn.getAggregationType().name(), column.getSelectedAggregation() ); - assertEquals( "LEFT", column.getHorizontalAlignment() ); - assertEquals( "test_mask", column.getFormatMask() ); - Assert.assertFalse( column.isHiddenForUser() ); - } - - private void assertElements( Category category, Element element ) { - assertEquals( category.getId(), element.getId() ); - assertEquals( category.getName( DEFAULT_LOCALE ), element.getName() ); - assertEquals( category.getDescription( DEFAULT_LOCALE ), element.getDescription() ); - assertFalse( element.getIsQueryElement() ); - assertNull( element.getParentId() ); - } - - private void assertModels( LogicalModel lmodel, Model model, String domainId ) { - assertNotNull( model ); - assertEquals( lmodel.getId(), model.getModelId() ); - assertEquals( domainId, model.getGroupId() ); - assertEquals( lmodel.getName( DEFAULT_LOCALE ), model.getName() ); - assertEquals( lmodel.getDescription( DEFAULT_LOCALE ), model.getDescription() ); - } - - private Query createMockQuery( String domainName, String modelId, String columnId ) { - Element elem = new Element(); - elem.setSelectedAggregation( "SUM" ); - elem.setId( columnId ); - Condition condition = mock( Condition.class ); - doReturn( "test_condition" ).when( condition ).getCondition( "String", null ); - doReturn( "AND" ).when( condition ).getCombinationType(); - doReturn( columnId ).when( condition ).getElementId(); - Order order = mock( Order.class ); - doReturn( columnId ).when( order ).getElementId(); - doReturn( "ASC" ).when( order ).getOrderType(); - Parameter paramater = mock( Parameter.class ); - doReturn( new String[] { "val_0", "val_1" } ).when( paramater ).getValue(); - doReturn( "parameter_name" ).when( paramater ).getName(); - doReturn( columnId ).when( paramater ).getElementId(); - Query srcQuery = mock( Query.class ); - doReturn( new Element[] { elem } ).when( srcQuery ).getElements(); - doReturn( new Condition[] { condition } ).when( srcQuery ).getConditions(); - doReturn( Boolean.FALSE ).when( srcQuery ).getDisableDistinct(); - doReturn( new Order[] { order } ).when( srcQuery ).getOrders(); - doReturn( new Parameter[] { paramater } ).when( srcQuery ).getParameters(); - return srcQuery; - } -} diff --git a/impl/server/src/test/java/org/pentaho/common/ui/metadata/service/MetadataServiceUtilTest.java b/impl/server/src/test/java/org/pentaho/common/ui/metadata/service/MetadataServiceUtilTest.java deleted file mode 100644 index e6f6b6250a..0000000000 --- a/impl/server/src/test/java/org/pentaho/common/ui/metadata/service/MetadataServiceUtilTest.java +++ /dev/null @@ -1,347 +0,0 @@ -/*! - * This program is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License, version 2.1 as published by the Free Software - * Foundation. - * - * You should have received a copy of the GNU Lesser General Public License along with this - * program; if not, you can obtain a copy at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html - * or from the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU Lesser General Public License for more details. - * - * Copyright (c) 2002-2017 Hitachi Vantara.. All rights reserved. - */ - -package org.pentaho.common.ui.metadata.service; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.pentaho.common.ui.metadata.model.impl.Column; -import org.pentaho.common.ui.metadata.model.impl.Condition; -import org.pentaho.common.ui.metadata.model.impl.Model; -import org.pentaho.common.ui.metadata.model.impl.Order; -import org.pentaho.common.ui.metadata.model.impl.Parameter; -import org.pentaho.common.ui.metadata.model.impl.Query; -import org.pentaho.commons.connection.IPentahoMetaData; -import org.pentaho.commons.connection.IPentahoResultSet; -import org.pentaho.metadata.model.Category; -import org.pentaho.metadata.model.Domain; -import org.pentaho.metadata.model.IPhysicalColumn; -import org.pentaho.metadata.model.LogicalColumn; -import org.pentaho.metadata.model.LogicalModel; -import org.pentaho.metadata.model.concept.Concept; -import org.pentaho.metadata.model.concept.types.AggregationType; -import org.pentaho.metadata.model.concept.types.Alignment; -import org.pentaho.metadata.model.concept.types.DataType; -import org.pentaho.metadata.model.concept.types.FieldType; -import org.pentaho.metadata.model.concept.types.LocalizedString; -import org.pentaho.metadata.query.model.CombinationType; -import org.pentaho.metadata.query.model.Constraint; -import org.pentaho.metadata.query.model.Order.Type; -import org.pentaho.metadata.query.model.Selection; -import org.pentaho.metadata.repository.IMetadataDomainRepository; - -public class MetadataServiceUtilTest { - - private static final String DEFAULT_LOCALE = "en"; - private static final String DOMAIN_ID = "domain_id"; - - private MetadataServiceUtil spyMetadataServiceUtil = spy( new MetadataServiceUtil() ); - - @Before - public void setUp() { - doReturn( DEFAULT_LOCALE ).when( spyMetadataServiceUtil ).getLocale(); - } - - @Test - public void testCreateThinModel() { - LogicalColumn column = - createMockColumn( "id_column", "name_column", "description_column", DataType.STRING, FieldType.ATTRIBUTE ); - List listColumns = new ArrayList( 1 ); - listColumns.add( column ); - Category category = createMockCategory( "id_category", "name_category", "description_category", listColumns ); - List listCategories = new ArrayList( 1 ); - listCategories.add( category ); - LogicalModel lmodel = createMockModel( "id", "name", "description", listCategories ); - - Model model = spyMetadataServiceUtil.createThinModel( lmodel, DOMAIN_ID ); - - assertModels( lmodel, model, DOMAIN_ID ); - assertEquals( 1, model.getCategories().length ); - org.pentaho.common.ui.metadata.model.impl.Category cat = model.getCategories()[0]; - assertCategories( category, cat ); - assertEquals( 1, cat.getColumns().length ); - Column col = cat.getColumns()[0]; - assertColumns( column, col, category.getId() ); - } - - @Test - public void testCreateCdaJson() throws JSONException { - String result = spyMetadataServiceUtil.createCdaJson( null, DEFAULT_LOCALE ); - assertNull( result ); - - Object[][] headers = new Object[][] { { new String( "Header_0" ), new String( "Header_1" ) } }; - IPentahoMetaData mockMetaData = mock( IPentahoMetaData.class ); - doReturn( headers ).when( mockMetaData ).getColumnHeaders(); - doReturn( DataType.STRING ).when( mockMetaData ).getAttribute( 0, 0, IPhysicalColumn.DATATYPE_PROPERTY ); - doReturn( DataType.BOOLEAN ).when( mockMetaData ).getAttribute( 0, 1, IPhysicalColumn.DATATYPE_PROPERTY ); - doReturn( new LocalizedString( DEFAULT_LOCALE, "name_0" ) ).when( mockMetaData ).getAttribute( 0, 0, - Concept.NAME_PROPERTY ); - doReturn( new LocalizedString( DEFAULT_LOCALE, "name_1" ) ).when( mockMetaData ).getAttribute( 0, 1, - Concept.NAME_PROPERTY ); - IPentahoResultSet mockResultSet = mock( IPentahoResultSet.class ); - doReturn( 2 ).when( mockResultSet ).getColumnCount(); - doReturn( 2 ).when( mockResultSet ).getRowCount(); - doReturn( "val_00" ).when( mockResultSet ).getValueAt( 0, 0 ); - doReturn( "val_01" ).when( mockResultSet ).getValueAt( 0, 1 ); - doReturn( "val_10" ).when( mockResultSet ).getValueAt( 1, 0 ); - doReturn( "val_11" ).when( mockResultSet ).getValueAt( 1, 1 ); - doReturn( mockMetaData ).when( mockResultSet ).getMetaData(); - - result = spyMetadataServiceUtil.createCdaJson( mockResultSet, DEFAULT_LOCALE ); - assertNotNull( result ); - JSONObject resultObj = new JSONObject( result ); - assertTrue( resultObj.has( "metadata" ) ); - assertTrue( resultObj.has( "resultset" ) ); - JSONArray resultset = resultObj.getJSONArray( "resultset" ); - assertEquals( "[[\"val_00\",\"val_01\"],[\"val_10\",\"val_11\"]]", resultset.toString() ); - JSONArray metadata = resultObj.getJSONArray( "metadata" ); - makeMetadataObjectAssertions( metadata.getJSONObject( 0 ), 0, "STRING" ); - makeMetadataObjectAssertions( metadata.getJSONObject( 1 ), 1, "BOOLEAN" ); - } - - private void makeMetadataObjectAssertions( JSONObject obj, int idx, String type ) throws JSONException { - assertEquals( "name_" + idx, obj.getString( "colLabel" ) ); - assertEquals( idx, obj.getInt( "colIndex" ) ); - assertEquals( type, obj.getString( "colType" ) ); - assertEquals( "Header_" + idx, obj.getString( "colName" ) ); - } - - @Test - public void testConvertQuery() { - String domainName = "test_domain"; - String modelId = "model_id"; - String columnId = "column_id"; - LogicalColumn mockColumn = mock( LogicalColumn.class ); - doReturn( DataType.STRING ).when( mockColumn ).getDataType(); - doReturn( columnId ).when( mockColumn ).getId(); - LogicalModel mockModel = mock( LogicalModel.class ); - doReturn( mockColumn ).when( mockModel ).findLogicalColumn( columnId ); - Domain mockDomain = mock( Domain.class ); - doReturn( mockModel ).when( mockDomain ).findLogicalModel( modelId ); - IMetadataDomainRepository mockRepo = mock( IMetadataDomainRepository.class ); - doReturn( mockDomain ).when( mockRepo ).getDomain( domainName ); - org.pentaho.metadata.model.Category category = mock( org.pentaho.metadata.model.Category.class ); - doReturn( category ).when( spyMetadataServiceUtil ).getCategory( columnId, mockModel ); - doReturn( mockRepo ).when( spyMetadataServiceUtil ).getDomainRepository(); - - Query srcQuery = createMockQuery( domainName, modelId, columnId ); - - org.pentaho.metadata.query.model.Query result = spyMetadataServiceUtil.convertQuery( srcQuery ); - - assertNotNull( result ); - assertEquals( mockDomain, result.getDomain() ); - assertFalse( result.getDisableDistinct() ); - assertEquals( mockModel, result.getLogicalModel() ); - assertEquals( 1, result.getSelections().size() ); - Selection selection = result.getSelections().get( 0 ); - assertEquals( mockColumn, selection.getLogicalColumn() ); - assertEquals( category, selection.getCategory() ); - assertEquals( AggregationType.SUM, selection.getActiveAggregationType() ); - assertEquals( AggregationType.SUM, selection.getAggregationType() ); - assertEquals( 1, result.getConstraints().size() ); - Constraint constraint = result.getConstraints().get( 0 ); - assertEquals( CombinationType.AND, constraint.getCombinationType() ); - assertNull( constraint.getFormula() ); - assertEquals( 1, result.getOrders().size() ); - org.pentaho.metadata.query.model.Order resOrder = result.getOrders().get( 0 ); - assertEquals( selection, resOrder.getSelection() ); - assertEquals( Type.ASC, resOrder.getType() ); - assertEquals( 1, result.getParameters().size() ); - org.pentaho.metadata.query.model.Parameter param = result.getParameters().get( 0 ); - assertEquals( "parameter_name", param.getName() ); - assertEquals( "val_0", param.getDefaultValue() ); - assertEquals( DataType.STRING, param.getType() ); - } - - @Test - public void testGetCategory() { - String columnId = "my_test_column_id"; - LogicalModel logicalModel = mock( LogicalModel.class ); - - doReturn( Collections.emptyList() ).when( logicalModel ).getCategories(); - Category result = spyMetadataServiceUtil.getCategory( columnId, logicalModel ); - assertNull( result ); - - LogicalColumn mockColumn = mock( LogicalColumn.class ); - Category mockCat1 = mock( Category.class ); - Category mockCat2 = mock( Category.class ); - doReturn( null ).when( mockCat1 ).findLogicalColumn( columnId ); - doReturn( mockColumn ).when( mockCat2 ).findLogicalColumn( columnId ); - List listCategories = new ArrayList( 2 ); - listCategories.add( mockCat1 ); - listCategories.add( mockCat2 ); - doReturn( listCategories ).when( logicalModel ).getCategories(); - result = spyMetadataServiceUtil.getCategory( columnId, logicalModel ); - assertEquals( mockCat2, result ); - } - - @Test - public void testDeserializeJsonQuery() { - String json = - "{\"class\":\"org.pentaho.common.ui.metadata.model.impl.Query\",\"columns\":[{\"aggTypes\":[]," - + "\"category\":\"MY_ORDERS\",\"class\":\"org.pentaho.common.ui.metadata.model.impl.Column\"," - + "\"defaultAggType\":\"SUM\",\"description\":null,\"fieldType\":null,\"formatMask\":null," - + "\"hiddenForUser\":false,\"horizontalAlignment\":\"LEFT\",\"id\":\"MY_COLUMN_ID\"," - + "\"name\":null,\"selectedAggType\":\"SUM\",\"type\":null}],\"conditions\":[{\"category\":\"MY_CATEGORY\"," - + "\"class\":\"org.pentaho.common.ui.metadata.model.impl.Condition\",\"column\":\"MY_COL_COND\"," - + "\"combinationType\":\"AND\",\"operator\":\"EQUAL\",\"parameterized\":false,\"selectedAggType\":null," - + "\"value\":[ ]}],\"defaultParameterMap\":null,\"disableDistinct\":false," - + "\"domainName\":\"my_test_domain\",\"modelId\":\"my_test_model_id\",\"orders\":[{\"category\":\"MY_CATEGORY\"," - + "\"class\":\"org.pentaho.common.ui.metadata.model.impl.Order\",\"column\":\"my_order_column\"," - + "\"orderType\":\"ASC\"}],\"parameters\":[]}"; - Query result = spyMetadataServiceUtil.deserializeJsonQuery( json ); - assertNotNull( result ); - assertEquals( "my_test_model_id", result.getModelId() ); - assertEquals( "my_test_domain", result.getDomainName() ); - assertFalse( result.getDisableDistinct() ); - assertEquals( 1, result.getColumns().length ); - Column column = result.getColumns()[0]; - assertEquals( "MY_COLUMN_ID", column.getId() ); - assertNull( column.getName() ); - assertNull( column.getDescription() ); - assertNull( column.getFieldType() ); - assertNull( column.getFormatMask() ); - assertNull( column.getType() ); - assertEquals( "SUM", column.getDefaultAggType() ); - assertEquals( "MY_ORDERS", column.getCategory() ); - assertEquals( "LEFT", column.getHorizontalAlignment() ); - assertEquals( "SUM", column.getSelectedAggType() ); - assertEquals( 1, result.getConditions().length ); - Condition condition = result.getConditions()[0]; - assertEquals( "MY_CATEGORY", condition.getCategory() ); - assertEquals( "MY_COL_COND", condition.getColumn() ); - assertEquals( "AND", condition.getCombinationType() ); - assertEquals( "EQUAL", condition.getOperator() ); - assertFalse( condition.isParameterized() ); - assertNull( condition.getSelectedAggType() ); - Assert.assertArrayEquals( new String[] { }, condition.getValue() ); - assertEquals( 1, result.getOrders().length ); - Order order = result.getOrders()[0]; - assertEquals( "MY_CATEGORY", order.getCategory() ); - assertEquals( "my_order_column", order.getColumn() ); - assertEquals( "ASC", order.getOrderType() ); - assertEquals( 0, result.getParameters().length ); - } - - private LogicalColumn createMockColumn( String id, String name, String desc, DataType dataType, FieldType fieldType ) { - LogicalColumn column = mock( LogicalColumn.class ); - doReturn( name ).when( column ).getName( DEFAULT_LOCALE ); - doReturn( id ).when( column ).getId(); - doReturn( desc ).when( column ).getDescription( DEFAULT_LOCALE ); - doReturn( dataType ).when( column ).getDataType(); - doReturn( fieldType ).when( column ).getFieldType(); - List aggList = new ArrayList( 2 ); - aggList.add( AggregationType.SUM ); - aggList.add( AggregationType.COUNT ); - doReturn( aggList ).when( column ).getAggregationList(); - doReturn( AggregationType.AVERAGE ).when( column ).getAggregationType(); - doReturn( Alignment.LEFT ).when( column ).getProperty( "alignment" ); - doReturn( "test_mask" ).when( column ).getProperty( "mask" ); - doReturn( Boolean.FALSE ).when( column ).getProperty( "hidden" ); - return column; - } - - private Category createMockCategory( String id, String name, String desc, List columns ) { - Category category = mock( Category.class ); - doReturn( name ).when( category ).getName( DEFAULT_LOCALE ); - doReturn( id ).when( category ).getId(); - doReturn( desc ).when( category ).getDescription( DEFAULT_LOCALE ); - doReturn( columns ).when( category ).getLogicalColumns(); - return category; - } - - private LogicalModel createMockModel( String id, String name, String desc, List categories ) { - LogicalModel lmodel = mock( LogicalModel.class ); - doReturn( name ).when( lmodel ).getName( DEFAULT_LOCALE ); - doReturn( id ).when( lmodel ).getId(); - doReturn( desc ).when( lmodel ).getDescription( DEFAULT_LOCALE ); - doReturn( categories ).when( lmodel ).getCategories(); - return lmodel; - } - - private void assertColumns( LogicalColumn lcolumn, Column column, String categoryId ) { - assertEquals( lcolumn.getId(), column.getId() ); - assertEquals( lcolumn.getName( DEFAULT_LOCALE ), column.getName() ); - assertEquals( lcolumn.getDescription( DEFAULT_LOCALE ), column.getDescription() ); - assertEquals( lcolumn.getDataType().getName().toUpperCase(), column.getType() ); - assertEquals( lcolumn.getFieldType().name(), column.getFieldType() ); - assertEquals( categoryId, column.getCategory() ); - Assert.assertArrayEquals( new String[] { "SUM", "COUNT", "AVERAGE" }, column.getAggTypes() ); - assertEquals( lcolumn.getAggregationType().name(), column.getDefaultAggType() ); - assertEquals( lcolumn.getAggregationType().name(), column.getSelectedAggType() ); - assertEquals( "LEFT", column.getHorizontalAlignment() ); - assertEquals( "test_mask", column.getFormatMask() ); - Assert.assertFalse( column.isHiddenForUser() ); - } - - private void assertCategories( Category category, org.pentaho.common.ui.metadata.model.impl.Category cat ) { - assertEquals( category.getId(), cat.getId() ); - assertEquals( category.getName( DEFAULT_LOCALE ), cat.getName() ); - assertEquals( category.getDescription( DEFAULT_LOCALE ), cat.getDescription() ); - } - - private void assertModels( LogicalModel lmodel, Model model, String domainId ) { - assertNotNull( model ); - assertEquals( lmodel.getId(), model.getId() ); - assertEquals( domainId, model.getDomainId() ); - assertEquals( lmodel.getName( DEFAULT_LOCALE ), model.getName() ); - assertEquals( lmodel.getDescription( DEFAULT_LOCALE ), model.getDescription() ); - } - - private Query createMockQuery( String domainName, String modelId, String columnId ) { - Column column = new Column(); - column.setSelectedAggType( "SUM" ); - column.setId( columnId ); - Condition condition = mock( Condition.class ); - doReturn( "test_condition" ).when( condition ).getCondition( "String", null ); - doReturn( "AND" ).when( condition ).getCombinationType(); - doReturn( columnId ).when( condition ).getColumn(); - Order order = mock( Order.class ); - doReturn( columnId ).when( order ).getColumn(); - doReturn( "ASC" ).when( order ).getOrderType(); - Parameter paramater = mock( Parameter.class ); - doReturn( new String[] { "val_0", "val_1" } ).when( paramater ).getValue(); - doReturn( "parameter_name" ).when( paramater ).getName(); - doReturn( columnId ).when( paramater ).getColumn(); - Query srcQuery = mock( Query.class ); - doReturn( domainName ).when( srcQuery ).getDomainName(); - doReturn( modelId ).when( srcQuery ).getModelId(); - doReturn( new Column[] { column } ).when( srcQuery ).getColumns(); - doReturn( new Condition[] { condition } ).when( srcQuery ).getConditions(); - doReturn( Boolean.FALSE ).when( srcQuery ).getDisableDistinct(); - doReturn( new Order[] { order } ).when( srcQuery ).getOrders(); - doReturn( new Parameter[] { paramater } ).when( srcQuery ).getParameters(); - return srcQuery; - } -} diff --git a/impl/server/src/test/java/org/pentaho/common/ui/metadata/service/SolutionRepoServiceTest.java b/impl/server/src/test/java/org/pentaho/common/ui/metadata/service/SolutionRepoServiceTest.java deleted file mode 100644 index 700bc3baeb..0000000000 --- a/impl/server/src/test/java/org/pentaho/common/ui/metadata/service/SolutionRepoServiceTest.java +++ /dev/null @@ -1,69 +0,0 @@ -/*! - * This program is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License, version 2.1 as published by the Free Software - * Foundation. - * - * You should have received a copy of the GNU Lesser General Public License along with this - * program; if not, you can obtain a copy at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html - * or from the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU Lesser General Public License for more details. - * - * Copyright (c) 2002-2017 Hitachi Vantara.. All rights reserved. - */ - -package org.pentaho.common.ui.metadata.service; - -import static org.apache.commons.lang.StringUtils.EMPTY; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; - -import org.junit.Test; -import org.pentaho.common.ui.services.SolutionRepoService; -import org.pentaho.common.ui.services.StateMessage; - -public class SolutionRepoServiceTest { - - private static final String FILE_PATH = "http://localhost/test"; - - private SolutionRepoService service = new SolutionRepoService(); - - @Test - public void testSaveStateString() throws Exception { - String state = "state"; - String type = "type"; - Boolean replace = false; - String title = "title"; - String description = "desc"; - - StateMessage result = service.saveStateString( EMPTY, state, type, replace, title, description ); - assertNotNull( result ); - assertEquals( StateMessage.STATUS_FAILED, result.getStatus() ); - - result = service.saveStateString( FILE_PATH, EMPTY, type, replace, title, description ); - assertNotNull( result ); - assertEquals( StateMessage.STATUS_FAILED, result.getStatus() ); - - result = service.saveStateString( FILE_PATH, state, EMPTY, replace, title, description ); - assertNotNull( result ); - assertEquals( StateMessage.STATUS_FAILED, result.getStatus() ); - - result = service.saveStateString( FILE_PATH, state, type, replace, title, description ); - assertNull( result ); - } - - @Test - public void testLoadState() throws Exception { - StateMessage result = service.loadState( EMPTY ); - assertNotNull( result ); - assertEquals( StateMessage.STATUS_FAILED, result.getStatus() ); - - result = service.loadState( FILE_PATH ); - assertNull( result ); - } - -} From 921c21eb952960abbb6c353b998a7bd04f58394e Mon Sep 17 00:00:00 2001 From: Peter Rinehart Date: Tue, 27 Aug 2024 12:10:26 -0400 Subject: [PATCH 29/40] [PPP-4174] Removing unnecessary unit tests; no more XML to parse. --- .../test/javascript/dataapi/models-mql.spec.js | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/impl/client/src/test/javascript/dataapi/models-mql.spec.js b/impl/client/src/test/javascript/dataapi/models-mql.spec.js index 90a73325c7..f0541f9324 100644 --- a/impl/client/src/test/javascript/dataapi/models-mql.spec.js +++ b/impl/client/src/test/javascript/dataapi/models-mql.spec.js @@ -47,14 +47,6 @@ define(["common-data/models-mql"], function(modelsMql) { }; } - it("mql.submit() should parse valid response", function() { - var obj = { field: 'value' }; - mql.getText = returnTextFunction(JSON.stringify(obj)); - - var result = mql.submit(''); - expect(result).toEqual(obj); - }); - it("mql.submit() should not call eval() for obtained result", function() { var bogusResponse = 'setFlag()'; mql.getText = returnTextFunction(bogusResponse); @@ -66,15 +58,6 @@ define(["common-data/models-mql"], function(modelsMql) { expect(flag).toBeFalsy(); }); - - it("mql.submitXmlQuery() should parse valid response", function() { - var obj = { field: 'value' }; - mql.getText = returnTextFunction(JSON.stringify(obj)); - - var result = mql.submitXmlQuery(queryObject); - expect(result).toEqual(obj); - }); - it("mql.submitXmlQuery() should not call eval() for obtained result", function() { var bogusResponse = 'setFlag()'; mql.getText = returnTextFunction(bogusResponse); From 7dc703301554848ddbe3b3900ec211c7689e8124 Mon Sep 17 00:00:00 2001 From: David Santos Date: Mon, 2 Sep 2024 10:07:30 +0100 Subject: [PATCH 30/40] chore: bump puppeter to latest version solves issue with build being stuck in 'npm install' --- impl/client/pom.xml | 4 +- package-lock.json | 1064 +++++++++++++++++++++++-------------------- package.json | 2 +- 3 files changed, 584 insertions(+), 486 deletions(-) diff --git a/impl/client/pom.xml b/impl/client/pom.xml index 476f1db9b8..045c7dffbf 100644 --- a/impl/client/pom.xml +++ b/impl/client/pom.xml @@ -30,8 +30,8 @@ **/*-require-js-cfg.js ${build.dependenciesDirectory}/META-INF/resources/webjars - v16.20.2 - 8.19.4 + v18.20.2 + 10.7.0 + + ${webjars.target.directory}/dojo/${dojo.version} + dojo/dojo + + tests/** + + + + + ${webjars.target.directory}/dojox/${dojo.version} + dojo/dojox + + */tests/** + */*/tests/** + .gitmodules + + + - ${build.dependenciesDirectory}/dojo-release-${dojo.version}-src - dojo + ${webjars.target.directory}/dijit/${dojo.version} + dojo/dijit - dojox/*/tests/** - dojox/*/*/tests/** - dojox/.gitmodules - dijit/tests/** - dojo/tests/** - util/** + tests/** + diff --git a/impl/client/src/main/javascript/web/dojo/pentaho/common/overrides/dijit/Dialog.js b/impl/client/src/main/javascript/web/dojo/pentaho/common/overrides/dijit/Dialog.js index a276436ad3..4b8bf39b89 100644 --- a/impl/client/src/main/javascript/web/dojo/pentaho/common/overrides/dijit/Dialog.js +++ b/impl/client/src/main/javascript/web/dojo/pentaho/common/overrides/dijit/Dialog.js @@ -1,29 +1,36 @@ /* Overridden due to BACKLOG-36893 - see comments starting with // Pentaho + see comments starting with // Pentaho + - lines: 106-116 + - lines: 285-302 + - lines: 685-689 + - lines: 696-697 + - lines: 755-758 + - lines: 766-769 */ define([ "require", - "dojo/_base/array", // Array.forEach array.indexOf array.map + "dojo/_base/array", // array.forEach array.indexOf array.map "dojo/aspect", - "dojo/_base/declare", // Declare + "dojo/_base/declare", // declare "dojo/Deferred", // Deferred - "dojo/dom", // Dom.isDescendant - "dojo/dom-class", // DomClass.add domClass.contains - "dojo/dom-geometry", // DomGeometry.position - "dojo/dom-style", // DomStyle.set - "dojo/_base/fx", // Fx.fadeIn fx.fadeOut - "dojo/i18n", // I18n.getLocalization + "dojo/dom", // dom.isDescendant + "dojo/dom-class", // domClass.add domClass.contains + "dojo/dom-geometry", // domGeometry.position + "dojo/dom-style", // domStyle.set + "dojo/_base/fx", // fx.fadeIn fx.fadeOut + "dojo/i18n", // i18n.getLocalization "dojo/keys", - "dojo/_base/lang", // Lang.mixin lang.hitch + "dojo/_base/lang", // lang.mixin lang.hitch "dojo/on", "dojo/ready", - "dojo/sniff", // Has("ie") has("opera") has("dijit-legacy-requires") - "dojo/window", // WinUtils.getBox, winUtils.get + "dojo/sniff", // has("ie") has("opera") has("dijit-legacy-requires") + "dojo/touch", + "dojo/window", // winUtils.getBox, winUtils.get "dojo/dnd/Moveable", // Moveable "dojo/dnd/TimedMoveable", // TimedMoveable "./focus", - "./_base/manager", // Manager.defaultDuration + "./_base/manager", // manager.defaultDuration "./_Widget", "./_TemplatedMixin", "./_CssStateMixin", @@ -31,16 +38,23 @@ define([ "./_DialogMixin", "./DialogUnderlay", "./layout/ContentPane", + "./layout/utils", "dojo/text!./templates/Dialog.html", + "./a11yclick", // template uses ondijitclick "dojo/i18n!./nls/common" ], function(require, array, aspect, declare, Deferred, - dom, domClass, domGeometry, domStyle, fx, i18n, keys, lang, on, ready, has, winUtils, - Moveable, TimedMoveable, focus, manager, _Widget, _TemplatedMixin, _CssStateMixin, _FormMixin, _DialogMixin, - DialogUnderlay, ContentPane, template) { + dom, domClass, domGeometry, domStyle, fx, i18n, keys, lang, on, ready, has, touch, winUtils, + Moveable, TimedMoveable, focus, manager, _Widget, _TemplatedMixin, _CssStateMixin, _FormMixin, _DialogMixin, + DialogUnderlay, ContentPane, utils, template){ - // Module: + // module: // dijit/Dialog + var resolvedDeferred = new Deferred(); + resolvedDeferred.resolve(true); + + function nop(){} + var _DialogBase = declare("dijit._DialogBase" + (has("dojo-bidi") ? "_NoBidi" : ""), [_TemplatedMixin, _FormMixin, _DialogMixin, _CssStateMixin], { templateString: template, @@ -51,23 +65,23 @@ define([ }, // Map widget attributes to DOMNode attributes. - _setTitleAttr: {node: "titleNode", type: "innerHTML"}, + _setTitleAttr: { node: "titleNode", type: "innerHTML" }, - // Open: [readonly] Boolean + // open: [readonly] Boolean // True if Dialog is currently displayed on screen. open: false, - // Duration: Integer + // duration: Integer // The time in milliseconds it takes the dialog to fade in and out duration: manager.defaultDuration, - // Refocus: Boolean + // refocus: Boolean // A Toggle to modify the default focus behavior of a Dialog, which // is to re-focus the element which had focus before being opened. // False will disable refocusing. Default: true refocus: true, - // Autofocus: Boolean + // autofocus: Boolean // A Toggle to modify the default focus behavior of a Dialog, which // is to focus on the first dialog element after opening the dialog. // False will disable autofocusing. Default: true @@ -83,57 +97,49 @@ define([ // Set by `dijit/_DialogMixin._getFocusItems()`. _lastFocusItem: null, - // DoLayout: [protected] Boolean - // Don't change this parameter from the default value. - // This ContentPane parameter doesn't make sense for Dialog, since Dialog - // is never a child of a layout container, nor can you specify the size of - // Dialog in order to control the size of an inner widget. - doLayout: false, - - // Draggable: Boolean + // draggable: Boolean // Toggles the movable aspect of the Dialog. If true, Dialog // can be dragged by it's title. If false it will remain centered // in the viewport. draggable: true, - // DialogOpener: DomNode + // dialogOpener: DomNode // Pentaho - Added to fix WCAG's focus-order when the dialogs are closed. // Especially for the dialogs that are opened via popupmenu. // Restores the focus back to element that opened popupmenu. dialogOpener: null, - // ElementRefresher: function(Element) : Element + // elementRefresher: function(Element) : Element // Pentaho - Added to support WCAG focus maintenance. // Allows "refreshing" the element to use for "refocus" to a corresponding one which is attached // to the document. Required to deal with UI elements which are discarded and rebuilt. elementRefresher: null, - _setDraggableAttr: function(/* Boolean*/ val) { + _setDraggableAttr: function(/*Boolean*/ val){ // Avoid _WidgetBase behavior of copying draggable attribute to this.domNode, // as that prevents text select on modern browsers (#14452) this._set("draggable", val); }, - // MaxRatio: Number + // maxRatio: Number // Maximum size to allow the dialog to expand to, relative to viewport size maxRatio: 0.9, - // Closable: Boolean + // closable: Boolean // Dialog show [x] icon to close itself, and ESC key will close the dialog. closable: true, - - _setClosableAttr: function(val) { + _setClosableAttr: function(val){ this.closeButtonNode.style.display = val ? "" : "none"; this._set("closable", val); }, - postMixInProperties: function() { + postMixInProperties: function(){ var _nlsResources = i18n.getLocalization("dijit", "common"); lang.mixin(this, _nlsResources); this.inherited(arguments); }, - postCreate: function() { + postCreate: function(){ domStyle.set(this.domNode, { display: "none", position: "absolute" @@ -144,12 +150,15 @@ define([ aspect.after(this, "onExecute", lang.hitch(this, "hide"), true); aspect.after(this, "onCancel", lang.hitch(this, "hide"), true); + on(this.closeButtonNode, touch.press, function(e){ + e.stopPropagation(); + }); this._modalconnects = []; }, - onLoad: function() { - // Summary: + onLoad: function(){ + // summary: // Called when data has been loaded from an href. // Unlike most other callbacks, this function can be connected to (via `dojo.connect`) // but should *not* be overridden. @@ -158,36 +167,36 @@ define([ // when href is specified we need to reposition the dialog after the data is loaded // and find the focusable elements - this._size(); + this.resize(); this._position(); - if(this.autofocus && DialogLevelManager.isTop(this)) { - this._getFocusItems(this.domNode); + if(this.autofocus && DialogLevelManager.isTop(this)){ + this._getFocusItems(); focus.focus(this._firstFocusItem); } this.inherited(arguments); }, - focus: function() { - this._getFocusItems(this.domNode); + focus: function(){ + this._getFocusItems(); focus.focus(this._firstFocusItem); }, - _endDrag: function() { - // Summary: + _endDrag: function(){ + // summary: // Called after dragging the Dialog. Saves the position of the dialog in the viewport, // and also adjust position to be fully within the viewport, so user doesn't lose access to handle - var nodePosition = domGeometry.position(this.domNode); - var viewport = winUtils.getBox(this.ownerDocument); + var nodePosition = domGeometry.position(this.domNode), + viewport = winUtils.getBox(this.ownerDocument); nodePosition.y = Math.min(Math.max(nodePosition.y, 0), (viewport.h - nodePosition.h)); nodePosition.x = Math.min(Math.max(nodePosition.x, 0), (viewport.w - nodePosition.w)); this._relativePosition = nodePosition; this._position(); }, - _setup: function() { - // Summary: + _setup: function(){ + // summary: // Stuff we need to do before showing the Dialog for the first // time (but we defer it until right beforehand, for // performance reasons). @@ -196,95 +205,45 @@ define([ var node = this.domNode; - if(this.titleBar && this.draggable) { - this._moveable = new ((has("ie") == 6) ? TimedMoveable // Prevent overload, see #5285 - : Moveable)(node, {handle: this.titleBar}); + if(this.titleBar && this.draggable){ + this._moveable = new ((has("ie") == 6) ? TimedMoveable // prevent overload, see #5285 + : Moveable)(node, { handle: this.titleBar }); aspect.after(this._moveable, "onMoveStop", lang.hitch(this, "_endDrag"), true); - } else { + }else{ domClass.add(node, "dijitDialogFixed"); } this.underlayAttrs = { dialogId: this.id, - "class": array.map(this.class.split(/\s/), function(s) { + "class": array.map(this["class"].split(/\s/),function(s){ return s + "_underlay"; - }) - .join(" "), + }).join(" "), _onKeyDown: lang.hitch(this, "_onKey"), ownerDocument: this.ownerDocument }; }, - _size: function() { - // Summary: - // If necessary, shrink dialog contents so dialog fits in viewport. - // tags: - // private - - this._checkIfSingleChild(); - - // If we resized the dialog contents earlier, reset them back to original size, so - // that if the user later increases the viewport size, the dialog can display w/out a scrollbar. - // Need to do this before the domGeometry.position(this.domNode) call below. - if(this._singleChild) { - if(typeof this._singleChildOriginalStyle !== "undefined") { - this._singleChild.domNode.style.cssText = this._singleChildOriginalStyle; - delete this._singleChildOriginalStyle; - } - } else { - domStyle.set(this.containerNode, { - width: "auto", - height: "auto" - }); - } - - var bb = domGeometry.position(this.domNode); - - // Get viewport size but then reduce it by a bit; Dialog should always have some space around it - // to indicate that it's a popup. This will also compensate for possible scrollbars on viewport. - var viewport = winUtils.getBox(this.ownerDocument); - viewport.w *= this.maxRatio; - viewport.h *= this.maxRatio; - - if(bb.w >= viewport.w || bb.h >= viewport.h) { - // Reduce size of dialog contents so that dialog fits in viewport - - var containerSize = domGeometry.position(this.containerNode); - var w = Math.min(bb.w, viewport.w) - (bb.w - containerSize.w); - var h = Math.min(bb.h, viewport.h) - (bb.h - containerSize.h); - - if(this._singleChild && this._singleChild.resize) { - if(typeof this._singleChildOriginalStyle === "undefined") { - this._singleChildOriginalStyle = this._singleChild.domNode.style.cssText; - } - this._singleChild.resize({w: w, h: h}); - } else { - domStyle.set(this.containerNode, { - width: w + "px", - height: h + "px", - overflow: "auto", - position: "relative" // Workaround IE bug moving scrollbar or dragging dialog - }); - } - } else if(this._singleChild && this._singleChild.resize) { - this._singleChild.resize(); - } + _size: function(){ + // TODO: remove for 2.0 + this.resize(); }, - _position: function() { - // Summary: + _position: function(){ + // summary: // Position the dialog in the viewport. If no relative offset // in the viewport has been determined (by dragging, for instance), // center the dialog. Otherwise, use the Dialog's stored relative offset, - // adjusted by the viewport's scroll. - if(!domClass.contains(this.ownerDocumentBody, "dojoMove")) { // Don't do anything if called during auto-scroll - var node = this.domNode; - var viewport = winUtils.getBox(this.ownerDocument); - var p = this._relativePosition; - var bb = p ? null : domGeometry.position(node); - var l = Math.floor(viewport.l + (p ? p.x : (viewport.w - bb.w) / 2)); - var t = Math.floor(viewport.t + (p ? p.y : (viewport.h - bb.h) / 2)) - ; + // clipped to fit inside the viewport (which may have been shrunk). + // Finally, adjust position according to viewport's scroll. + + if(!domClass.contains(this.ownerDocumentBody, "dojoMove")){ // don't do anything if called during auto-scroll + var node = this.domNode, + viewport = winUtils.getBox(this.ownerDocument), + p = this._relativePosition, + bb = domGeometry.position(node), + l = Math.floor(viewport.l + (p ? Math.min(p.x, viewport.w - bb.w) : (viewport.w - bb.w) / 2)), + t = Math.floor(viewport.t + (p ? Math.min(p.y, viewport.h - bb.h) : (viewport.h - bb.h) / 2)); + domStyle.set(node, { left: l + "px", top: t + "px" @@ -292,31 +251,31 @@ define([ } }, - _onKey: function(/* Event*/ evt) { - // Summary: + _onKey: function(/*Event*/ evt){ + // summary: // Handles the keyboard events for accessibility reasons // tags: // private - if(evt.keyCode == keys.TAB) { - this._getFocusItems(this.domNode); + if(evt.keyCode == keys.TAB){ + this._getFocusItems(); var node = evt.target; - if(this._firstFocusItem == this._lastFocusItem) { - // Don't move focus anywhere, but don't allow browser to move focus off of dialog either + if(this._firstFocusItem == this._lastFocusItem){ + // don't move focus anywhere, but don't allow browser to move focus off of dialog either evt.stopPropagation(); evt.preventDefault(); - } else if(node == this._firstFocusItem && evt.shiftKey) { - // If we are shift-tabbing from first focusable item in dialog, send focus to last item + }else if(node == this._firstFocusItem && evt.shiftKey){ + // if we are shift-tabbing from first focusable item in dialog, send focus to last item focus.focus(this._lastFocusItem); evt.stopPropagation(); evt.preventDefault(); - } else if(node == this._lastFocusItem && !evt.shiftKey) { - // If we are tabbing from last focusable item in dialog, send focus to first item + }else if(node == this._lastFocusItem && !evt.shiftKey){ + // if we are tabbing from last focusable item in dialog, send focus to first item focus.focus(this._firstFocusItem); evt.stopPropagation(); evt.preventDefault(); } - } else if(this.closable && evt.keyCode == keys.ESCAPE) { + }else if(this.closable && evt.keyCode == keys.ESCAPE){ this.onCancel(); evt.stopPropagation(); evt.preventDefault(); @@ -342,27 +301,27 @@ define([ return elem; }, - show: function() { - // Summary: + show: function(){ + // summary: // Display the dialog // returns: dojo/promise/Promise // Promise object that resolves when the display animation is complete - if(this.open) { - return; + if(this.open){ + return resolvedDeferred.promise; } - if(!this._started) { + if(!this._started){ this.startup(); } - // First time we show the dialog, there's some initialization stuff to do - if(!this._alreadyInitialized) { + // first time we show the dialog, there's some initialization stuff to do + if(!this._alreadyInitialized){ this._setup(); this._alreadyInitialized = true; } - if(this._fadeOutDeferred) { + if(this._fadeOutDeferred){ // There's a hide() operation in progress, so cancel it, but still call DialogLevelManager.hide() // as though the hide() completed, in preparation for the DialogLevelManager.show() call below. this._fadeOutDeferred.cancel(); @@ -370,8 +329,10 @@ define([ } // Recenter Dialog if user scrolls browser. Connecting to document doesn't work on IE, need to use window. + // Be sure that event object doesn't get passed to resize() method, because it's expecting an optional + // {w: ..., h:...} arg. var win = winUtils.get(this.ownerDocument); - this._modalconnects.push(on(win, "scroll", lang.hitch(this, "resize"))); + this._modalconnects.push(on(win, "scroll", lang.hitch(this, "resize", null))); this._modalconnects.push(on(this.domNode, "keydown", lang.hitch(this, "_onKey"))); @@ -381,18 +342,19 @@ define([ }); this._set("open", true); - this._onShow(); // Lazy load trigger + this._onShow(); // lazy load trigger - this._size(); + this.resize(); this._position(); - // Fade-in Animation object, setup below + // fade-in Animation object, setup below var fadeIn; - this._fadeInDeferred = new Deferred(lang.hitch(this, function() { + this._fadeInDeferred = new Deferred(lang.hitch(this, function(){ fadeIn.stop(); delete this._fadeInDeferred; })); + this._fadeInDeferred.then(undefined, nop); // avoid spurious CancelError message to console // If delay is 0, code below will delete this._fadeInDeferred instantly, so grab promise while we can. var promise = this._fadeInDeferred.promise; @@ -400,50 +362,50 @@ define([ fadeIn = fx.fadeIn({ node: this.domNode, duration: this.duration, - beforeBegin: lang.hitch(this, function() { + beforeBegin: lang.hitch(this, function(){ DialogLevelManager.show(this, this.underlayAttrs); }), - onEnd: lang.hitch(this, function() { - if(this.autofocus && DialogLevelManager.isTop(this)) { - // Find focusable items each time dialog is shown since if dialog contains a widget the + onEnd: lang.hitch(this, function(){ + if(this.autofocus && DialogLevelManager.isTop(this)){ + // find focusable items each time dialog is shown since if dialog contains a widget the // first focusable items can change - this._getFocusItems(this.domNode); + this._getFocusItems(); focus.focus(this._firstFocusItem); } this._fadeInDeferred.resolve(true); delete this._fadeInDeferred; }) - }) - .play(); + }).play(); return promise; }, - hide: function() { - // Summary: + hide: function(){ + // summary: // Hide the dialog // returns: dojo/promise/Promise // Promise object that resolves when the display animation is complete // If we haven't been initialized yet then we aren't showing and we can just return. // Likewise if we are already hidden, or are currently fading out. - if(!this._alreadyInitialized || !this.open) { - return; + if(!this._alreadyInitialized || !this.open){ + return resolvedDeferred.promise; } - if(this._fadeInDeferred) { + if(this._fadeInDeferred){ this._fadeInDeferred.cancel(); } - // Fade-in Animation object, setup below + // fade-in Animation object, setup below var fadeOut; - this._fadeOutDeferred = new Deferred(lang.hitch(this, function() { + this._fadeOutDeferred = new Deferred(lang.hitch(this, function(){ fadeOut.stop(); delete this._fadeOutDeferred; })); + this._fadeOutDeferred.then(undefined, nop); // avoid spurious CancelError message to console - // Fire onHide when the promise resolves. - this._fadeOutDeferred.then(lang.hitch(this, "onHide")); + // fire onHide when the promise resolves. + this._fadeOutDeferred.then(lang.hitch(this, 'onHide')); // If delay is 0, code below will delete this._fadeOutDeferred instantly, so grab promise while we can. var promise = this._fadeOutDeferred.promise; @@ -451,24 +413,23 @@ define([ fadeOut = fx.fadeOut({ node: this.domNode, duration: this.duration, - onEnd: lang.hitch(this, function() { + onEnd: lang.hitch(this, function(){ this.domNode.style.display = "none"; DialogLevelManager.hide(this); this._fadeOutDeferred.resolve(true); delete this._fadeOutDeferred; }) - }) - .play(); + }).play(); - if(this._scrollConnected) { + if(this._scrollConnected){ this._scrollConnected = false; } var h; - while(h = this._modalconnects.pop()) { + while(h = this._modalconnects.pop()){ h.remove(); } - if(this._relativePosition) { + if(this._relativePosition){ delete this._relativePosition; } this._set("open", false); @@ -476,15 +437,115 @@ define([ return promise; }, - resize: function() { - // Summary: - // Called when viewport scrolled or size changed. Adjust Dialog as necessary to keep it visible. - // tags: - // private - if(this.domNode.style.display != "none") { - this._size(); - if(!has("touch")) { - // If the user has scrolled the display then reposition the Dialog. But don't do it for touch + resize: function(dim){ + // summary: + // Called with no argument when viewport scrolled or viewport size changed. Adjusts Dialog as + // necessary to keep it visible. + // + // Can also be called with an argument (by dojox/layout/ResizeHandle etc.) to explicitly set the + // size of the dialog. + // dim: Object? + // Optional dimension object like {w: 200, h: 300} + + if(this.domNode.style.display != "none"){ + + this._checkIfSingleChild(); + + if(!dim){ + if(this._shrunk){ + // If we earlier shrunk the dialog to fit in the viewport, reset it to its natural size + if(this._singleChild){ + if(typeof this._singleChildOriginalStyle != "undefined"){ + this._singleChild.domNode.style.cssText = this._singleChildOriginalStyle; + delete this._singleChildOriginalStyle; + } + } + array.forEach([this.domNode, this.containerNode, this.titleBar, this.actionBarNode], function(node){ + if(node){ // because titleBar may not be defined + domStyle.set(node, { + position: "static", + width: "auto", + height: "auto" + }); + } + }); + this.domNode.style.position = "absolute"; + } + + // If necessary, shrink Dialog to fit in viewport and have some space around it + // to indicate that it's a popup. This will also compensate for possible scrollbars on viewport. + var viewport = winUtils.getBox(this.ownerDocument); + viewport.w *= this.maxRatio; + viewport.h *= this.maxRatio; + + var bb = domGeometry.position(this.domNode); + this._shrunk = false; + // First check and limit width, because limiting the width may increase the height due to word wrapping. + if(bb.w >= viewport.w){ + dim = { + w: viewport.w + }; + domGeometry.setMarginBox(this.domNode, dim); + bb = domGeometry.position(this.domNode); + this._shrunk = true; + } + // Now check and limit the height + if(bb.h >= viewport.h){ + if(!dim){ + dim = { + w: bb.w + }; + } + dim.h = viewport.h; + this._shrunk = true; + } + if(dim){ + if(!dim.w){ + dim.w = bb.w; + } + if(!dim.h){ + dim.h = bb.h; + } + } + } + + // Code to run if user has requested an explicit size, or the shrinking code above set an implicit size + if(dim){ + // Set this.domNode to specified size + domGeometry.setMarginBox(this.domNode, dim); + + // And then size this.containerNode + var layoutNodes = []; + if(this.titleBar){ + layoutNodes.push({domNode: this.titleBar, region: "top"}); + } + if(this.actionBarNode){ + layoutNodes.push({domNode: this.actionBarNode, region: "bottom"}); + } + var centerSize = {domNode: this.containerNode, region: "center"}; + layoutNodes.push(centerSize); + + var contentDim = utils.marginBox2contentBox(this.domNode, dim); + utils.layoutChildren(this.domNode, contentDim, layoutNodes); + + // And then if this.containerNode has a single layout widget child, size it too. + // Otherwise, make this.containerNode show a scrollbar if it's overflowing. + if(this._singleChild){ + var cb = utils.marginBox2contentBox(this.containerNode, centerSize); + // note: if containerNode has padding singleChildSize will have l and t set, + // but don't pass them to resize() or it will doubly-offset the child + this._singleChild.resize({w: cb.w, h: cb.h}); + // TODO: save original size for restoring it on another show()? + }else{ + this.containerNode.style.overflow = "auto"; + this._layoutChildren(); // send resize() event to all child widgets + } + }else{ + this._layoutChildren(); // send resize() event to all child widgets + } + + if(!has("touch") && !dim){ + // If the user has scrolled the viewport then reposition the Dialog. But don't do it for touch // devices, because it will counteract when a keyboard pops up and then the browser auto-scrolls // the focused node into view. this._position(); @@ -492,18 +553,29 @@ define([ } }, - destroy: function() { - if(this._fadeInDeferred) { + _layoutChildren: function(){ + // Override _ContentPaneResizeMixin._layoutChildren because even when there's just a single layout child + // widget, sometimes we don't want to size it explicitly (i.e. to pass a dim argument to resize()) + + array.forEach(this.getChildren(), function(widget){ + if(widget.resize){ + widget.resize(); + } + }); + }, + + destroy: function(){ + if(this._fadeInDeferred){ this._fadeInDeferred.cancel(); } - if(this._fadeOutDeferred) { + if(this._fadeOutDeferred){ this._fadeOutDeferred.cancel(); } - if(this._moveable) { + if(this._moveable){ this._moveable.destroy(); } var h; - while(h = this._modalconnects.pop()) { + while(h = this._modalconnects.pop()){ h.remove(); } @@ -513,16 +585,16 @@ define([ } }); - if(has("dojo-bidi")) { + if(has("dojo-bidi")){ _DialogBase = declare("dijit._DialogBase", _DialogBase, { - _setTitleAttr: function(/* String*/ title) { + _setTitleAttr: function(/*String*/ title){ this._set("title", title); this.titleNode.innerHTML = title; this.applyTextDir(this.titleNode); }, - _setTextDirAttr: function(textDir) { - if(this._created && this.textDir != textDir) { + _setTextDirAttr: function(textDir){ + if(this._created && this.textDir != textDir){ this._set("textDir", textDir); this.set("title", this.title); } @@ -531,7 +603,7 @@ define([ } var Dialog = declare("dijit.Dialog", [ContentPane, _DialogBase], { - // Summary: + // summary: // A modal dialog Widget. // description: // Pops up a modal dialog window, blocking access to the screen @@ -544,18 +616,18 @@ define([ // | foo.placeAt(win.body()); // | foo.startup(); }); - Dialog._DialogBase = _DialogBase; // For monkey patching and dojox/widget/DialogSimple + Dialog._DialogBase = _DialogBase; // for monkey patching and dojox/widget/DialogSimple var DialogLevelManager = Dialog._DialogLevelManager = { - // Summary: + // summary: // Controls the various active "levels" on the page, starting with the // stuff initially visible on the page (at z-index 0), and then having an entry for // each Dialog shown. _beginZIndex: 950, - show: function(/* dijit/_WidgetBase*/ dialog, /* Object*/ underlayAttrs) { - // Summary: + show: function(/*dijit/_WidgetBase*/ dialog, /*Object*/ underlayAttrs){ + // summary: // Call right before fade-in animation for new dialog. // Saves current focus, displays/adjusts underlay for new dialog, // and sets the z-index of the dialog itself. @@ -570,7 +642,7 @@ define([ // Set z-index a bit above previous dialog var zIndex = ds[ds.length - 1].dialog ? ds[ds.length - 1].zIndex + 2 : Dialog._DialogLevelManager._beginZIndex; - domStyle.set(dialog.domNode, "zIndex", zIndex); + domStyle.set(dialog.domNode, 'zIndex', zIndex); // Display the underlay, or if already displayed then adjust for this new dialog DialogUnderlay.show(underlayAttrs, zIndex - 1); @@ -578,8 +650,8 @@ define([ ds.push({dialog: dialog, underlayAttrs: underlayAttrs, zIndex: zIndex}); }, - hide: function(/* dijit/_WidgetBase*/ dialog) { - // Summary: + hide: function(/*dijit/_WidgetBase*/ dialog){ + // summary: // Called when the specified dialog is hidden/destroyed, after the fade-out // animation ends, in order to reset page focus, fix the underlay, etc. // If the specified dialog isn't open then does nothing. @@ -587,28 +659,28 @@ define([ // Caller is responsible for either setting display:none on the dialog domNode, // or calling dijit/popup.hide(), or removing it from the page DOM. - if(ds[ds.length - 1].dialog == dialog) { + if(ds[ds.length - 1].dialog == dialog){ // Removing the top (or only) dialog in the stack, return focus // to previous dialog ds.pop(); - var pd = ds[ds.length - 1]; // The new active dialog (or the base page itself) + var pd = ds[ds.length - 1]; // the new active dialog (or the base page itself) // Adjust underlay - if(ds.length == 1) { + if(ds.length == 1){ // Returning to original page. Hide the underlay. DialogUnderlay.hide(); - } else { + }else{ // Popping back to previous dialog, adjust underlay. DialogUnderlay.show(pd.underlayAttrs, pd.zIndex - 1); } // Adjust focus. - // TODO: regardless of setting of dialog.refocus, if the execute() method set focus somewhere, + // TODO: regardless of setting of dialog.refocus, if the exeucte() method set focus somewhere, // don't shift focus back to button. Note that execute() runs at the start of the fade-out but // this code runs later, at the end of the fade-out. Menu has code like this. - if(dialog.refocus) { + if(dialog.refocus){ var focus; // Pentaho - BACKLOG-36893 hack if(dialog.dialogOpener) { @@ -625,36 +697,36 @@ define([ focus = dialog._refreshElement(pd.focus); // End of BACKLOG-36893 - if(pd.dialog && (!focus || !dom.isDescendant(focus, pd.dialog.domNode))) { - pd.dialog._getFocusItems(pd.dialog.domNode); + if(pd.dialog && (!focus || !dom.isDescendant(focus, pd.dialog.domNode))){ + pd.dialog._getFocusItems(); focus = pd.dialog._firstFocusItem; } } - if(focus) { + if(focus){ // Refocus the button that spawned the Dialog. This will fail in corner cases including // page unload on IE, because the dijit/form/Button that launched the Dialog may get destroyed // before this code runs. (#15058) - try { + try{ focus.focus(); - } catch(e) { + }catch(e){ } } } - } else { + }else{ // Removing a dialog out of order (#9944, #10705). // Don't need to mess with underlay or z-index or anything. - var idx = array.indexOf(array.map(ds, function(elem) { + var idx = array.indexOf(array.map(ds, function(elem){ return elem.dialog; }), dialog); - if(idx != -1) { + if(idx != -1){ ds.splice(idx, 1); } } }, - isTop: function(/* dijit/_WidgetBase*/ dialog) { - // Summary: + isTop: function(/*dijit/_WidgetBase*/ dialog){ + // summary: // Returns true if specified Dialog is the top in the task return ds[ds.length - 1].dialog == dialog; } @@ -669,31 +741,33 @@ define([ // underlayAttrs: attributes to set on underlay (when this widget is active) // } var ds = Dialog._dialogStack = [ - {dialog: null, focus: null, underlayAttrs: null} // Entry for stuff at z-index: 0 + {dialog: null, focus: null, underlayAttrs: null} // entry for stuff at z-index: 0 ]; // If focus was accidentally removed from the dialog, such as if the user clicked a blank // area of the screen, or clicked the browser's address bar and then tabbed into the page, // then refocus. Won't do anything if focus was removed because the Dialog was closed, or // because a new Dialog popped up on top of the old one, or when focus moves to popups - focus.watch("curNode", function(attr, oldNode, node) { + focus.watch("curNode", function(attr, oldNode, node){ // Note: if no dialogs, ds.length==1 but ds[ds.length-1].dialog is null var topDialog = ds[ds.length - 1].dialog; + // Pentaho function isGwtModalDialogNode(node) { return domClass.contains(node, "pentaho-gwt") && domClass.contains(node, "pentaho-dialog") && domClass.contains(node, "modal"); } // If a node was focused, and there's a Dialog currently showing, and not in the process of fading out... // Ignore focus events on other document though because it's likely an Editor inside of the Dialog. - if(node && topDialog && !topDialog._fadeOutDeferred && node.ownerDocument == topDialog.ownerDocument) { + if(node && topDialog && !topDialog._fadeOutDeferred && node.ownerDocument == topDialog.ownerDocument){ // If the node that was focused is inside the dialog or in a popup, even a context menu that isn't // technically a descendant of the the dialog, don't do anything. - do { - if(node == topDialog.domNode || domClass.contains(node, "dijitPopup") || isGwtModalDialogNode(node)) { + do{ + // Pentaho + if(node == topDialog.domNode || domClass.contains(node, "dijitPopup") || isGwtModalDialogNode(node)){ return; } - } while(node = node.parentNode); + }while(node = node.parentNode); // Otherwise, return focus to the dialog. Use a delay to avoid confusing dijit/focus code's // own tracking of focus. @@ -702,10 +776,10 @@ define([ }); // Back compat w/1.6, remove for 2.0 - if(has("dijit-legacy-requires")) { - ready(0, function() { + if(has("dijit-legacy-requires")){ + ready(0, function(){ var requires = ["dijit/TooltipDialog"]; - require(requires); // Use indirection so modules not rolled into a build + require(requires); // use indirection so modules not rolled into a build }); } diff --git a/impl/client/src/main/javascript/web/dojo/pentaho/common/overrides/dijit/Menu.js b/impl/client/src/main/javascript/web/dojo/pentaho/common/overrides/dijit/Menu.js index 9348b2b773..ed5f836dc1 100644 --- a/impl/client/src/main/javascript/web/dojo/pentaho/common/overrides/dijit/Menu.js +++ b/impl/client/src/main/javascript/web/dojo/pentaho/common/overrides/dijit/Menu.js @@ -1,5 +1,6 @@ /* Overridden due to BACKLOG-37807 - see comments starting with // Pentaho + see comments starting with // Pentaho + - line: 188 */ define([ @@ -22,7 +23,7 @@ define([ ], function(require, array, declare, dom, domAttr, domGeometry, domStyle, keys, lang, on, has, win, winUtils, pm, DropDownMenu, ready){ // module: - // dijit/Menu + // dijit/Menu // Back compat w/1.6, remove for 2.0 if(has("dijit-legacy-requires")){ @@ -34,35 +35,35 @@ define([ return declare("dijit.Menu", DropDownMenu, { // summary: - // A context menu you can assign to multiple elements + // A context menu you can assign to multiple elements constructor: function(/*===== params, srcNodeRef =====*/){ // summary: - // Create the widget. + // Create the widget. // params: Object|null - // Hash of initialization parameters for widget, including scalar values (like title, duration etc.) - // and functions, typically callbacks like onClick. - // The hash can contain any of the widget's properties, excluding read-only properties. + // Hash of initialization parameters for widget, including scalar values (like title, duration etc.) + // and functions, typically callbacks like onClick. + // The hash can contain any of the widget's properties, excluding read-only properties. // srcNodeRef: DOMNode|String? - // If a srcNodeRef (DOM node) is specified: + // If a srcNodeRef (DOM node) is specified: // - // - use srcNodeRef.innerHTML as my contents - // - replace srcNodeRef with my generated DOM tree + // - use srcNodeRef.innerHTML as my contents + // - replace srcNodeRef with my generated DOM tree this._bindings = []; }, // targetNodeIds: [const] String[] - // Array of dom node ids of nodes to attach to. - // Fill this with nodeIds upon widget creation and it becomes context menu for those nodes. + // Array of dom node ids of nodes to attach to. + // Fill this with nodeIds upon widget creation and it becomes context menu for those nodes. targetNodeIds: [], // selector: String? - // CSS expression to apply this Menu to descendants of targetNodeIds, rather than to - // the nodes specified by targetNodeIds themselves. Useful for applying a Menu to - // a range of rows in a table, tree, etc. + // CSS expression to apply this Menu to descendants of targetNodeIds, rather than to + // the nodes specified by targetNodeIds themselves. Useful for applying a Menu to + // a range of rows in a table, tree, etc. // - // The application must require() an appropriate level of dojo/query to handle the selector. + // The application must require() an appropriate level of dojo/query to handle the selector. selector: "", // TODO: in 2.0 remove support for multiple targetNodeIds. selector gives the same effect. @@ -70,22 +71,23 @@ define([ /*===== // currentTarget: [readonly] DOMNode - // For context menus, set to the current node that the Menu is being displayed for. - // Useful so that the menu actions can be tailored according to the node + // For context menus, set to the current node that the Menu is being displayed for. + // Useful so that the menu actions can be tailored according to the node currentTarget: null, =====*/ // contextMenuForWindow: [const] Boolean - // If true, right clicking anywhere on the window will cause this context menu to open. - // If false, must specify targetNodeIds. + // If true, right clicking anywhere on the window will cause this context menu to open. + // If false, must specify targetNodeIds. contextMenuForWindow: false, // leftClickToOpen: [const] Boolean - // If true, menu will open on left click instead of right click, similar to a file menu. + // If true, menu will open on left click instead of right click, similar to a file menu. leftClickToOpen: false, + // TODO: remove in 2.0, we have better ways of opening a menu with a left click, by extending _HasDropDown. // refocus: Boolean - // When this menu closes, re-focus the element which had focus before it was opened. + // When this menu closes, re-focus the element which had focus before it was opened. refocus: true, postCreate: function(){ @@ -100,29 +102,29 @@ define([ // thanks burstlib! _iframeContentWindow: function(/* HTMLIFrameElement */iframe_el){ // summary: - // Returns the window reference of the passed iframe + // Returns the window reference of the passed iframe // tags: - // private + // private return winUtils.get(this._iframeContentDocument(iframe_el)) || - // Moz. TODO: is this available when defaultView isn't? - this._iframeContentDocument(iframe_el)['__parent__'] || - (iframe_el.name && document.frames[iframe_el.name]) || null; // Window + // Moz. TODO: is this available when defaultView isn't? + this._iframeContentDocument(iframe_el)['__parent__'] || + (iframe_el.name && document.frames[iframe_el.name]) || null; // Window }, _iframeContentDocument: function(/* HTMLIFrameElement */iframe_el){ // summary: - // Returns a reference to the document object inside iframe_el + // Returns a reference to the document object inside iframe_el // tags: - // protected + // protected return iframe_el.contentDocument // W3 - || (iframe_el.contentWindow && iframe_el.contentWindow.document) // IE - || (iframe_el.name && document.frames[iframe_el.name] && document.frames[iframe_el.name].document) - || null; // HTMLDocument + || (iframe_el.contentWindow && iframe_el.contentWindow.document) // IE + || (iframe_el.name && document.frames[iframe_el.name] && document.frames[iframe_el.name].document) + || null; // HTMLDocument }, bindDomNode: function(/*String|DomNode*/ node){ // summary: - // Attach menu to given node + // Attach menu to given node node = dom.byId(node, this.ownerDocument); var cn; // Connect node @@ -131,7 +133,7 @@ define([ // to bind to the node inside the iframe. if(node.tagName.toLowerCase() == "iframe"){ var iframe = node, - window = this._iframeContentWindow(iframe); + window = this._iframeContentWindow(iframe); cn = win.body(window.document); }else{ // To capture these events at the top level, attach to , not . @@ -157,31 +159,45 @@ define([ // we need to monitor keyboard events in addition to the oncontextmenu event. var doConnects = lang.hitch(this, function(cn){ var selector = this.selector, - delegatedEvent = selector ? - function(eventType){ - return on.selector(selector, eventType); - } : - function(eventType){ - return eventType; - }, - self = this; + delegatedEvent = selector ? + function(eventType){ + return on.selector(selector, eventType); + } : + function(eventType){ + return eventType; + }, + self = this; return [ - // TODO: when leftClickToOpen is true then shouldn't space/enter key trigger the menu, - // rather than shift-F10? on(cn, delegatedEvent(this.leftClickToOpen ? "click" : "contextmenu"), function(evt){ - // Schedule context menu to be opened unless it's already been scheduled from onkeydown handler evt.stopPropagation(); evt.preventDefault(); - self._scheduleOpen(this, iframe, {x: evt.pageX, y: evt.pageY}); + + if((new Date()).getTime() < self._lastKeyDown + 500){ + // Ignore contextmenu/click events that were already processed in keydown handler below. + // But still call preventDefault() (above) so system context menu doesn't appear. + return; + } + + // Schedule context menu to be opened. + // Note that this won't work will if the click was generated by the keyboard, while + // focused on a