openui5-fhir - npm Package Compare versions

Comparing version 2.0.4 to 2.0.5

CHANGELOG.md

@@ -0,1 +1,8 @@
+## [2.0.5](https://github.com/SAP/openui5-fhir/compare/v2.0.4...v2.0.5) (2021-03-10)
+
+
+### Bug Fixes
+
+* single filter or sorter object ([#237](https://github.com/SAP/openui5-fhir/issues/237)) ([552f2fc](https://github.com/SAP/openui5-fhir/commit/552f2fcb04314705f4ac8aa81f2b0c35714fe87d))
+
 ## [2.0.4](https://github.com/SAP/openui5-fhir/compare/v2.0.3...v2.0.4) (2020-11-26)
@@ -2,0 +9,0 @@

package.json

 {
   "name": "openui5-fhir",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "author": "SAP SE",
@@ -28,15 +28,15 @@ "license": "Apache-2.0",
   "devDependencies": {
-    "eslint": "^7.14.0",
+    "eslint": "^7.21.0",
     "eslint-watch": "^7.0.0",
-    "js-beautify": "^1.13.0",
+    "js-beautify": "^1.13.5",
     "jsdoc": "^3.6.6",
-    "karma": "^5.2.3",
+    "karma": "^6.1.2",
     "karma-chrome-launcher": "^3.1.0",
     "karma-coverage": "^2.0.3",
     "karma-junit-reporter": "^2.0.1",
-    "karma-ui5": "^2.3.2",
-    "@ui5/cli": "^2.6.4",
+    "karma-ui5": "^2.3.3",
+    "@ui5/cli": "^2.10.1",
     "coveralls": "^3.1.0",
-    "replace-in-file": "^6.1.0",
-    "js-yaml": "^3.14.0",
+    "replace-in-file": "^6.2.0",
+    "js-yaml": "^4.0.0",
     "@semantic-release/git": "^9.0.0",
@@ -43,0 +43,0 @@ "@semantic-release/changelog": "^5.0.1"

src/sap/fhir/library.js

@@ -11,3 +11,3 @@ sap.ui.define(function() {
 	 * @author SAP SE
-	 * @version 2.0.4
+	 * @version 2.0.5
 	 * @public
@@ -17,3 +17,3 @@ */
 		name : "sap.fhir",
-		version : "2.0.4",
+		version : "2.0.5",
 		noLibraryCSS: true,
@@ -20,0 +20,0 @@ dependencies : [ "sap.ui.core" ],

src/sap/fhir/model/r4/Context.js

 /*!
- * SAP SE
- * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ * ${copyright}
  */
@@ -34,3 +32,3 @@
 	 * @since 1.0.0
-	 * @version 2.0.4
+	 * @version 2.0.5
 	 *
@@ -37,0 +35,0 @@ * @see sap.fhir.model.r4.Context.create

src/sap/fhir/model/r4/FHIRContextBinding.js

 /*!
- * SAP SE
- * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ * ${copyright}
  */
@@ -36,3 +34,3 @@
 	 * @since 1.0.0
-	 * @version 2.0.4
+	 * @version 2.0.5
 	 */
@@ -39,0 +37,0 @@ var FHIRContextBinding = ContextBinding.extend("sap.fhir.model.r4.FHIRContextBinding", {

src/sap/fhir/model/r4/FHIRFilter.js

 /*!
- * SAP SE
- * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ * ${copyright}
  */
@@ -6,0 +4,0 @@

src/sap/fhir/model/r4/FHIRFilterOperator.js

 /*!
- * SAP SE
- * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ * ${copyright}
  */
@@ -6,0 +4,0 @@

src/sap/fhir/model/r4/FHIRFilterOperatorUtils.js

 /*!
- * SAP SE
- * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ * ${copyright}
  */
@@ -21,3 +19,3 @@
 	 * @since 1.0.0
-	 * @version 2.0.4
+	 * @version 2.0.5
 	 */
@@ -24,0 +22,0 @@ var FHIRFilterOperatorUtils = {};

src/sap/fhir/model/r4/FHIRFilterProcessor.js

 /*!
- * SAP SE
- * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ * ${copyright}
  */
@@ -25,3 +23,3 @@
 	 * @since 1.0.0
-	 * @version 2.0.4
+	 * @version 2.0.5
 	 */
@@ -28,0 +26,0 @@ var FHIRFilterProcessor = {};

src/sap/fhir/model/r4/FHIRFilterType.js

 /*!
- * SAP SE
- * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ * ${copyright}
  */
@@ -6,0 +4,0 @@

src/sap/fhir/model/r4/FHIRListBinding.js

 /*!
- * SAP SE
- * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ * ${copyright}
  */
@@ -32,4 +30,4 @@
 	 * @param {sap.fhir.model.r4.Context} [oContext] The parent context which is required as base for a relative path
-	 * @param {sap.ui.model.Sorter[]} [aSorters] The dynamic sorters to be used initially
-	 * @param {sap.ui.model.Filter[]} [aFilters] The dynamic application filters to be used initially
+	 * @param {sap.ui.model.Sorter | sap.ui.model.Sorter[]} [aSorters] The dynamic sorters to be used initially (can be either a sorter or an array of sorters)
+	 * @param {sap.ui.model.Filter | sap.ui.model.Filter[]} [aFilters] The dynamic application filters to be used initially (can be either a filter or an array of filters)
 	 * @param {object} [mParameters] The map which contains additional parameters for the binding
@@ -49,3 +47,3 @@ * @param {string} [mParameters.groupId] The group id
 	 * @since 1.0.0
-	 * @version 2.0.4
+	 * @version 2.0.5
 	 */
@@ -56,4 +54,4 @@ var FHIRListBinding = ListBinding.extend("sap.fhir.model.r4.FHIRListBinding", {
 			ListBinding.apply(this, arguments);
-			this.aFilters = aFilters;
-			this.aSorters = aSorters;
+			this.aFilters = aFilters instanceof Filter ? [aFilters] : aFilters;
+			this.aSorters = aSorters instanceof Sorter ? [aSorters] : aSorters;
 			this.mParameters = mParameters;
@@ -60,0 +58,0 @@ this.sOperationMode = (mParameters && mParameters.operationMode) || this.oModel.sDefaultOperationMode;

src/sap/fhir/model/r4/FHIRPropertyBinding.js

 /*!
- * SAP SE
- * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ * ${copyright}
  */
@@ -33,3 +31,3 @@
 	 * @since 1.0.0
-	 * @version 2.0.4
+	 * @version 2.0.5
 	 */
@@ -36,0 +34,0 @@ var FHIRPropertyBinding = PropertyBinding.extend("sap.fhir.model.r4.FHIRPropertyBinding", {

src/sap/fhir/model/r4/FHIRUtils.js

 /*!
- * SAP SE
- * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ * ${copyright}
  */
@@ -13,4 +11,6 @@
 	"sap/base/util/merge",
-	"sap/base/util/deepEqual"
-], function(FHIRFilterOperatorUtils, FHIRFilterOperator, ChangeReason, merge, deepEqual) {
+	"sap/base/util/deepEqual",
+	"sap/ui/model/Filter",
+	"sap/ui/model/Sorter"
+], function(FHIRFilterOperatorUtils, FHIRFilterOperator, ChangeReason, merge, deepEqual, Filter, Sorter) {
 
@@ -28,3 +28,3 @@ "use strict";
 	 * @since 1.0.0
-	 * @version 2.0.4
+	 * @version 2.0.5
 	 */
@@ -516,3 +516,3 @@ var FHIRUtils = {};
 	 *
-	 * @param {sap.ui.model.Filter[]} [aFilters] The filters defined for the list binding
+	 * @param {sap.ui.model.Filter | sap.ui.model.Filter[]} [aFilters] The filters defined for the list binding (can be either a filter or an array of filters)
 	 * @param {sap.fhir.model.r4.FHIRListBinding | sap.fhir.model.r4.FHIRTreeBinding} oBinding The binding which triggered the filter
@@ -523,2 +523,8 @@ * @public
 	FHIRUtils.filter = function(aFilters, oBinding){
+		if (!aFilters) {
+			aFilters = [];
+		}
+		if (aFilters instanceof Filter) {
+			aFilters = [aFilters];
+		}
 		if (oBinding.bPendingRequest){
@@ -547,3 +553,3 @@ var fnQueryLastFilters = function() {
 	 *
-	 * @param {sap.ui.model.Sorter[]} aSorters The sorters defined for the list binding
+	 * @param {sap.ui.model.Sorter | sap.ui.model.Sorter[]} aSorters The sorters defined for the list binding (can be either a sorter or an array of sorters)
 	 * @param {sap.fhir.model.r4.FHIRListBinding | sap.fhir.model.r4.FHIRTreeBinding} oBinding The binding which triggered the sort
@@ -555,2 +561,8 @@ * @param {boolean} bRefresh If the binding should directly send a call or wait for the filters, for p13ndialog
 	FHIRUtils.sort = function(aSorters, oBinding, bRefresh){
+		if (!aSorters) {
+			aSorters = [];
+		}
+		if (aSorters instanceof Sorter) {
+			aSorters = [aSorters];
+		}
 		if (oBinding.bPendingRequest){
@@ -557,0 +569,0 @@ var fnQueryLastSorters = function() {

src/sap/fhir/model/r4/lib/BindingInfo.js

 /*!
- * SAP SE
- * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ * ${copyright}
  */
@@ -31,3 +29,3 @@
 	 * @since 1.0.0
-	 * @version 2.0.4
+	 * @version 2.0.5
 	 */
@@ -34,0 +32,0 @@ var BindingInfo = function(sResourceId, sResourceType, sResourcePath, sRelativePath, sAbsolutePath, aBinding, sGroupId, sRequestPath, aResourcePath, sResourceServerPath, sETag) {

src/sap/fhir/model/r4/lib/FHIRBundle.js

 /*!
- * SAP SE
- * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ * ${copyright}
  */
@@ -21,3 +19,3 @@
 	 * @since 1.0.0
-	 * @version 2.0.4
+	 * @version 2.0.5
 	 */
@@ -24,0 +22,0 @@ var FHIRBundle = function(sBundleType, sGroupId) {

src/sap/fhir/model/r4/lib/FHIRBundleEntry.js

 /*!
- * SAP SE
- * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ * ${copyright}
  */
@@ -23,3 +21,3 @@
 	 * @since 1.0.0
-	 * @version 2.0.4
+	 * @version 2.0.5
 	 */
@@ -26,0 +24,0 @@ var FHIRBundleEntry = function(sFullUrl, oResource, oRequest) {

src/sap/fhir/model/r4/lib/FHIRBundleRequest.js

 /*!
- * SAP SE
- * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ * ${copyright}
  */
@@ -31,3 +29,3 @@
 	 * @since 1.0.0
-	 * @version 2.0.4
+	 * @version 2.0.5
 	 */
@@ -34,0 +32,0 @@ var FHIRBundleRequest = function(oBinding, sMethod, sUrl, fnSuccess, fnError, sIfMatch, sIfNoneMatch, sIfNoneExist, sIfModifiedSince) {

src/sap/fhir/model/r4/lib/FHIRBundleType.js

 /*!
- * SAP SE
- * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ * ${copyright}
  */
@@ -6,0 +4,0 @@

src/sap/fhir/model/r4/lib/FHIROperationOutcome.js

 /*!
- * SAP SE
- * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ * ${copyright}
  */
@@ -21,3 +19,3 @@
 	 * @since 2.0.0
-	 * @version 2.0.4
+	 * @version 2.0.5
 	 */
@@ -24,0 +22,0 @@ var FHIROperationOutcome = function (oResource) {

src/sap/fhir/model/r4/lib/FHIRRequestor.js

 /*!
- * SAP SE
- * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ * ${copyright}
  */
@@ -39,3 +37,3 @@
 	 * @since 1.0.0
-	 * @version 2.0.4
+	 * @version 2.0.5
 	 */
@@ -42,0 +40,0 @@ var FHIRRequestor = function(sServiceUrl, oModel, bCSRF, sPrefer, oDefaultQueryParams) {

src/sap/fhir/model/r4/lib/FHIRUrl.js

 /*!
- * SAP SE
- * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ * ${copyright}
  */
@@ -22,3 +20,3 @@
 	 * @since 1.0.0
-	 * @version 2.0.4
+	 * @version 2.0.5
 	 */
@@ -25,0 +23,0 @@ var FHIRUrl = function(sUrl, sServiceUrl) {

src/sap/fhir/model/r4/lib/HTTPMethod.js

 /*!
- * SAP SE
- * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ * ${copyright}
  */
@@ -20,3 +18,3 @@
 	 * @since 1.0.0
-	 * @version 2.0.4
+	 * @version 2.0.5
 	 */
@@ -23,0 +21,0 @@ var HTTPMethod = {

src/sap/fhir/model/r4/lib/RequestHandle.js

 /*!
- * SAP SE
- * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ * ${copyright}
  */
@@ -22,3 +20,3 @@
 	 * @since 1.0.0
-	 * @version 2.0.4
+	 * @version 2.0.5
 	 */
@@ -25,0 +23,0 @@ var RequestHandle = function(oBinding) {

src/sap/fhir/model/r4/lib/Sliceable.js

 /*!
- * SAP SE
- * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ * ${copyright}
  */
@@ -24,3 +22,3 @@
 	 * @since 1.0.0
-	 * @version 2.0.4
+	 * @version 2.0.5
 	 */
@@ -27,0 +25,0 @@ var Sliceable = {};

src/sap/fhir/model/r4/OperationMode.js

 /*!
- * SAP SE
- * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ * ${copyright}
  */
@@ -20,3 +18,3 @@
 	 * @since 1.0.0
-	 * @version 2.0.4
+	 * @version 2.0.5
 	 */
@@ -23,0 +21,0 @@ var OperationMode = {

src/sap/fhir/model/r4/SubmitMode.js

 /*!
- * SAP SE
- * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ * ${copyright}
  */
@@ -19,3 +17,3 @@
 	 * @since 1.0.0
-	 * @version 2.0.4
+	 * @version 2.0.5
 	 */
@@ -22,0 +20,0 @@ var SubmitMode = {

src/sap/fhir/model/r4/type/Uri.js

 /*!
- * SAP SE
- * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ * ${copyright}
  */
@@ -18,3 +16,3 @@
  * @since 1.1.0
- * @version 2.0.4
+ * @version 2.0.5
  */
@@ -21,0 +19,0 @@

src/sap/fhir/model/r4/type/Url.js

 /*!
- * SAP SE
- * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ * ${copyright}
  */
@@ -15,3 +13,3 @@
  * @since 1.1.0
- * @version 2.0.4
+ * @version 2.0.5
  */
@@ -18,0 +16,0 @@

src/sap/fhir/model/r4/type/Uuid.js

 /*!
- * SAP SE
- * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ * ${copyright}
  */
@@ -15,3 +13,3 @@
  * @since 1.1.0
- * @version 2.0.4
+ * @version 2.0.5
  */
@@ -18,0 +16,0 @@

No alert changes

Worsened metrics

Total package byte prevSize

325802

decreased by-0.68%

Lines of code

7471

decreased by-0.52%

No dependency changes