openui5-fhir - npm Package Compare versions

Comparing version 2.2.3 to 2.2.4

CHANGELOG.md

@@ -0,1 +1,8 @@
+## [2.2.4](https://github.com/SAP/openui5-fhir/compare/v2.2.3...v2.2.4) (2021-05-19)
+
+
+### Bug Fixes
+
+* support combined filters  ([#265](https://github.com/SAP/openui5-fhir/issues/265)) ([cffc66a](https://github.com/SAP/openui5-fhir/commit/cffc66af875ed579752fa01f8b09a0eb2e98b6de))
+
 ## [2.2.3](https://github.com/SAP/openui5-fhir/compare/v2.2.2...v2.2.3) (2021-05-14)
@@ -2,0 +9,0 @@

package.json

 {
   "name": "openui5-fhir",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "author": "SAP SE",
@@ -31,3 +31,3 @@ "license": "Apache-2.0",
     "js-beautify": "^1.13.13",
-    "jsdoc": "^3.6.6",
+    "jsdoc": "^3.6.7",
     "karma": "^6.3.2",
@@ -38,3 +38,3 @@ "karma-chrome-launcher": "^3.1.0",
     "karma-ui5": "^2.3.3",
-    "@ui5/cli": "^2.10.3",
+    "@ui5/cli": "^2.10.4",
     "coveralls": "^3.1.0",
@@ -41,0 +41,0 @@ "replace-in-file": "^6.2.0",

src/sap/fhir/library.js

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

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

@@ -32,3 +32,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 2.2.3
+	 * @version 2.2.4
 	 *
@@ -35,0 +35,0 @@ * @see sap.fhir.model.r4.Context.create

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

@@ -34,3 +34,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 2.2.3
+	 * @version 2.2.4
 	 */
@@ -37,0 +37,0 @@ var FHIRContextBinding = ContextBinding.extend("sap.fhir.model.r4.FHIRContextBinding", {

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

@@ -23,3 +23,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 2.2.3
+	 * @version 2.2.4
 	 */
@@ -26,0 +26,0 @@ var FHIRFilterOperatorUtils = {};

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

@@ -23,3 +23,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 2.2.3
+	 * @version 2.2.4
 	 */
@@ -26,0 +26,0 @@ var FHIRFilterProcessor = {};

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

@@ -46,3 +46,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 2.2.3
+	 * @version 2.2.4
 	 */
@@ -496,7 +496,8 @@ var FHIRListBinding = ListBinding.extend("sap.fhir.model.r4.FHIRListBinding", {
 			 * @param {sap.ui.model.Filter[]} [aFilters] The filters defined for the list binding
+			 * @param {sap.ui.model.FilterType} sFilterType Type of the filter which should be adjusted, if it is not given, the standard behaviour applies
 			 * @public
 			 * @since 1.0.0
 			 */
-	FHIRListBinding.prototype.filter = function(aFilters) {
-		FHIRUtils.filter(aFilters, this);
+	FHIRListBinding.prototype.filter = function (aFilters, sFilterType) {
+		FHIRUtils.filter(aFilters, this, sFilterType);
 	};
@@ -503,0 +504,0 @@

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

@@ -31,3 +31,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 2.2.3
+	 * @version 2.2.4
 	 */
@@ -34,0 +34,0 @@ var FHIRPropertyBinding = PropertyBinding.extend("sap.fhir.model.r4.FHIRPropertyBinding", {

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

@@ -14,4 +14,6 @@ /*!
 	"sap/ui/model/Filter",
-	"sap/ui/model/Sorter"
-], function (FHIRFilterOperatorUtils, FHIRFilterOperator, FHIRFilterComplexOperator, ChangeReason, merge, deepEqual, Filter, Sorter) {
+	"sap/ui/model/Sorter",
+	"sap/ui/model/FilterProcessor",
+	"sap/ui/model/FilterType"
+], function (FHIRFilterOperatorUtils, FHIRFilterOperator, FHIRFilterComplexOperator, ChangeReason, merge, deepEqual, Filter, Sorter, FilterProcessor, FilterType) {
 
@@ -29,3 +31,3 @@ "use strict";
 	 * @since 1.0.0
-	 * @version 2.2.3
+	 * @version 2.2.4
 	 */
@@ -569,6 +571,7 @@ var FHIRUtils = {};
 	 * @param {sap.fhir.model.r4.FHIRListBinding | sap.fhir.model.r4.FHIRTreeBinding} oBinding The binding which triggered the filter
+	 * @param {sap.ui.model.FilterType} sFilterType Type of the filter which should be adjusted, if it is not given, the standard behaviour applies
 	 * @public
 	 * @since 1.0.0
 	 */
-	FHIRUtils.filter = function (aFilters, oBinding) {
+	FHIRUtils.filter = function (aFilters, oBinding, sFilterType) {
 		if (!aFilters) {
@@ -580,2 +583,14 @@ aFilters = [];
 		}
+
+		if (sFilterType == FilterType.Application) {
+			oBinding.aApplicationFilters = aFilters;
+		} else {
+			oBinding.aFilters = aFilters;
+		}
+		//if no application-filters are present, or they are not in array form/empty array, init the filters with []
+		if (!oBinding.aApplicationFilters || !Array.isArray(oBinding.aApplicationFilters) || oBinding.aApplicationFilters.length === 0) {
+			oBinding.aApplicationFilters = [];
+		}
+		oBinding.oCombinedFilter = FilterProcessor.combineFilters(oBinding.aFilters, oBinding.aApplicationFilters);
+
 		if (oBinding.bPendingRequest) {
@@ -596,3 +611,2 @@ var fnQueryLastFilters = function () {
 		} else {
-			oBinding.aFilters = aFilters;
 			oBinding.refresh(ChangeReason.Filter);
@@ -599,0 +613,0 @@ }

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

@@ -29,3 +29,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 2.2.3
+	 * @version 2.2.4
 	 */
@@ -32,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

@@ -19,3 +19,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 2.2.3
+	 * @version 2.2.4
 	 */
@@ -22,0 +22,0 @@ var FHIRBundle = function(sBundleType, sGroupId) {

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

@@ -21,3 +21,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 2.2.3
+	 * @version 2.2.4
 	 */
@@ -24,0 +24,0 @@ var FHIRBundleEntry = function(sFullUrl, oResource, oRequest) {

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

@@ -29,3 +29,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 2.2.3
+	 * @version 2.2.4
 	 */
@@ -32,0 +32,0 @@ var FHIRBundleRequest = function(oBinding, sMethod, sUrl, fnSuccess, fnError, sIfMatch, sIfNoneMatch, sIfNoneExist, sIfModifiedSince) {

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

@@ -19,3 +19,3 @@ /*!
 	 * @since 2.0.0
-	 * @version 2.2.3
+	 * @version 2.2.4
 	 */
@@ -22,0 +22,0 @@ var FHIROperationOutcome = function (oResource) {

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

@@ -37,3 +37,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 2.2.3
+	 * @version 2.2.4
 	 */
@@ -40,0 +40,0 @@ var FHIRRequestor = function(sServiceUrl, oModel, bCSRF, sPrefer, oDefaultQueryParams) {

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

@@ -20,3 +20,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 2.2.3
+	 * @version 2.2.4
 	 */
@@ -23,0 +23,0 @@ var FHIRUrl = function(sUrl, sServiceUrl) {

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

@@ -18,3 +18,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 2.2.3
+	 * @version 2.2.4
 	 */
@@ -21,0 +21,0 @@ var HTTPMethod = {

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

@@ -20,3 +20,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 2.2.3
+	 * @version 2.2.4
 	 */
@@ -23,0 +23,0 @@ var RequestHandle = function(oBinding) {

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

@@ -22,3 +22,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 2.2.3
+	 * @version 2.2.4
 	 */
@@ -25,0 +25,0 @@ var Sliceable = {};

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

@@ -18,3 +18,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 2.2.3
+	 * @version 2.2.4
 	 */
@@ -21,0 +21,0 @@ var OperationMode = {

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

@@ -17,3 +17,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 2.2.3
+	 * @version 2.2.4
 	 */
@@ -20,0 +20,0 @@ var SubmitMode = {

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

@@ -16,3 +16,3 @@ /*!
  * @since 1.1.0
- * @version 2.2.3
+ * @version 2.2.4
  */
@@ -19,0 +19,0 @@

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

@@ -13,3 +13,3 @@ /*!
  * @since 1.1.0
- * @version 2.2.3
+ * @version 2.2.4
  */
@@ -16,0 +16,0 @@

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

@@ -13,3 +13,3 @@ /*!
  * @since 1.1.0
- * @version 2.2.3
+ * @version 2.2.4
  */
@@ -16,0 +16,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

342664

increased by0.4%

Lines of code

7820

increased by0.18%

No dependency changes