Skip to content

Commit

Permalink
fix: upgrade UI5 version from 1.70.0 to 1.75.0 (#109)
Browse files Browse the repository at this point in the history
* chore: upgrade UI5 version to 1.71.12

* fix: fixes filter issue with UI5 version 1.71 above

* chore: upgrade UI5 version to 1.72.7

* chore: upgrade UI5 version to 1.73.2

* chore: upgrade UI5 version to 1.74.0

* chore: upgrade UI5 version to 1.75.0
  • Loading branch information
flovogt authored Mar 27, 2020
1 parent 523c1aa commit fb19439
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 7 deletions.
6 changes: 3 additions & 3 deletions docs/tutorials/1 Getting Started.md
Original file line number Diff line number Diff line change
Expand Up @@ -272,9 +272,9 @@ The *sap.fhir* library is included in the following NPM package: `openui5-fhir`.
"@ui5/cli": "^1.4.4"
},
"dependencies": {
"@openui5/sap.m": "^1.70.0",
"@openui5/sap.ui.core": "^1.70.0",
"@openui5/themelib_sap_belize": "^1.70.0",
"@openui5/sap.m": "^1.75.0",
"@openui5/sap.ui.core": "^1.75.0",
"@openui5/themelib_sap_belize": "^1.75.0",
"openui5-fhir": "1.0.0"
},
"scripts" : {
Expand Down
2 changes: 1 addition & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module.exports = function (config) {


ui5: {
url: "https://openui5.hana.ondemand.com/1.70.0/",
url: "https://openui5.hana.ondemand.com/1.75.0/",
testpage: "test/testsuite.qunit.html"
},

Expand Down
3 changes: 3 additions & 0 deletions src/sap/fhir/model/r4/FHIRFilterProcessor.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ sap.ui.define([
*/
FHIRFilterProcessor._evaluateFilter = function(oFilter, vRef, fnGetValue){
var oValue, fnTest;

FilterProcessor._normalizeCache = { "true": {}, "false": {}};

if (oFilter.aFilters) {
return this._evaluateMultiFilter(oFilter, vRef, fnGetValue);
}
Expand Down
2 changes: 1 addition & 1 deletion test/qunit/unit.qunit.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<title>Unit tests for sap.fhir library</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<script id="sap-ui-bootstrap" src="https://openui5.hana.ondemand.com/1.70.0/resources/sap-ui-core.js"
<script id="sap-ui-bootstrap" src="https://openui5.hana.ondemand.com/1.75.0/resources/sap-ui-core.js"
data-sap-ui-theme="sap_belize" data-sap-ui-libs="sap.m"
data-sap-ui-compatVersion="edge" data-sap-ui-preload="async"
data-sap-ui-resourceroots='{
Expand Down
2 changes: 1 addition & 1 deletion test/sap-fhir-test-app/webapp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<title>sap.fhir-TestApp</title>

<script id="sap-ui-bootstrap"
src="https://openui5.hana.ondemand.com/1.70.0/resources/sap-ui-core.js"
src="https://openui5.hana.ondemand.com/1.75.0/resources/sap-ui-core.js"
data-sap-ui-libs="sap.m" data-sap-ui-theme="sap_belize"
data-sap-ui-compatVersion="edge" data-sap-ui-preload="async"
data-sap-ui-resourceroots='{"sap-fhir-test-app": ""}'>
Expand Down
2 changes: 1 addition & 1 deletion test/sap-fhir-test-app/webapp/test/opa5/all.opa5.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta http-equiv='X-UA-Compatible' content='IE=edge'>
<meta charset="utf-8">
<script id="sap-ui-bootstrap"
src="https://openui5.hana.ondemand.com/1.70.0/resources/sap-ui-core.js"
src="https://openui5.hana.ondemand.com/1.75.0/resources/sap-ui-core.js"
data-sap-ui-theme="sap_belize" data-sap-ui-libs="sap.m"
data-sap-ui-compatVersion="edge" data-sap-ui-preload="async"
data-sap-ui-resourceroots='{"sap-fhir-test-app": "../../", "openui5-fhir.test": "../../../../"}'>
Expand Down

0 comments on commit fb19439

Please sign in to comment.