openui5-fhir - npm Package Compare versions

Comparing version 2.2.1 to 2.2.2

CHANGELOG.md

@@ -0,1 +1,8 @@
+## [2.2.2](https://github.com/SAP/openui5-fhir/compare/v2.2.1...v2.2.2) (2021-05-03)
+
+
+### Bug Fixes
+
+* operators concatenation in _filter ([#257](https://github.com/SAP/openui5-fhir/issues/257)) ([5bc09db](https://github.com/SAP/openui5-fhir/commit/5bc09dbacfc318fabc9665e8d4d384ed368d7194))
+
 ## [2.2.1](https://github.com/SAP/openui5-fhir/compare/v2.2.0...v2.2.1) (2021-04-26)
@@ -2,0 +9,0 @@

package.json

 {
   "name": "openui5-fhir",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "author": "SAP SE",
@@ -28,3 +28,3 @@ "license": "Apache-2.0",
   "devDependencies": {
-    "eslint": "^7.24.0",
+    "eslint": "^7.25.0",
     "eslint-watch": "^7.0.0",
@@ -31,0 +31,0 @@ "js-beautify": "^1.13.13",

src/sap/fhir/library.js

@@ -11,3 +11,3 @@ sap.ui.define(function() {
 	 * @author SAP SE
-	 * @version 2.2.1
+	 * @version 2.2.2
 	 * @public
@@ -17,3 +17,3 @@ */
 		name : "sap.fhir",
-		version : "2.2.1",
+		version : "2.2.2",
 		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.1
+	 * @version 2.2.2
 	 *
@@ -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.1
+	 * @version 2.2.2
 	 */
@@ -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.1
+	 * @version 2.2.2
 	 */
@@ -26,0 +26,0 @@ var FHIRFilterOperatorUtils = {};

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

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

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

@@ -46,3 +46,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 2.2.1
+	 * @version 2.2.2
 	 */
@@ -49,0 +49,0 @@ var FHIRListBinding = ListBinding.extend("sap.fhir.model.r4.FHIRListBinding", {

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

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

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

@@ -28,3 +28,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 2.2.1
+	 * @version 2.2.2
 	 */
@@ -468,3 +468,3 @@ var FHIRUtils = {};
 					}
-					this._complexFilterBuilder(oFilter, mParameters, undefined);
+					this._complexFilterBuilder(oFilter, mParameters);
 				} else if (oFilter._bMultiFilter && iLvl <= iSupportedFilterDepth) {
@@ -524,18 +524,20 @@ this.filterBuilder(oFilter.aFilters, mParameters, iSupportedFilterDepth, bIsValueSet, iLvl + 1, oFilter._bMultiFilter, oFilter.bAnd);
 	 * @param {object} mParameters The parameters which should be passed to the request
-	 * @param {string} [sLogicalConnection] if the list of filters needs to be combined either with AND or OR
 	 * @private
 	 * @since 2.1.0
 	 */
-	FHIRUtils._complexFilterBuilder = function (oFilter, mParameters, sLogicalConnection) {
-		var sLogicalConnection1;
+	FHIRUtils._complexFilterBuilder = function (oFilter, mParameters) {
+		var sLogicalConnection;
 		if (oFilter instanceof Filter) {
 			if (oFilter._bMultiFilter) {
 				// recursive
-				sLogicalConnection1 = oFilter.bAnd && oFilter.bAnd == true ? "and" : "or";
+				sLogicalConnection = oFilter.bAnd && oFilter.bAnd == true ? "and" : "or";
 				if (oFilter.aFilters) {
 					mParameters._filter = mParameters._filter + "( ";
 					// for the first filter the logical connection shouldnt be appended
-					this._complexFilterBuilder(oFilter.aFilters[0], mParameters, undefined);
+					this._complexFilterBuilder(oFilter.aFilters[0], mParameters);
 					for (var i = 1; i < oFilter.aFilters.length; i++) {
-						this._complexFilterBuilder(oFilter.aFilters[i], mParameters, sLogicalConnection1);
+						if (sLogicalConnection) {
+							mParameters._filter = mParameters._filter + " " + sLogicalConnection + " ";
+						}
+						this._complexFilterBuilder(oFilter.aFilters[i], mParameters);
 					}
@@ -558,7 +560,3 @@ mParameters._filter = mParameters._filter + " )";
 				}
-				if (sLogicalConnection) {
-					mParameters._filter = mParameters._filter + " " + sLogicalConnection + " " + sFilter;
-				} else {
-					mParameters._filter = mParameters._filter + sFilter;
-				}
+				mParameters._filter = mParameters._filter + sFilter;
 			}
@@ -565,0 +563,0 @@ }

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

@@ -29,3 +29,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 2.2.1
+	 * @version 2.2.2
 	 */
@@ -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.1
+	 * @version 2.2.2
 	 */
@@ -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.1
+	 * @version 2.2.2
 	 */
@@ -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.1
+	 * @version 2.2.2
 	 */
@@ -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.1
+	 * @version 2.2.2
 	 */
@@ -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.1
+	 * @version 2.2.2
 	 */
@@ -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.1
+	 * @version 2.2.2
 	 */
@@ -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.1
+	 * @version 2.2.2
 	 */
@@ -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.1
+	 * @version 2.2.2
 	 */
@@ -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.1
+	 * @version 2.2.2
 	 */
@@ -25,0 +25,0 @@ var Sliceable = {};

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

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

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

@@ -17,3 +17,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 2.2.1
+	 * @version 2.2.2
 	 */
@@ -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.1
+ * @version 2.2.2
  */
@@ -19,0 +19,0 @@

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

@@ -13,3 +13,3 @@ /*!
  * @since 1.1.0
- * @version 2.2.1
+ * @version 2.2.2
  */
@@ -16,0 +16,0 @@

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

@@ -13,3 +13,3 @@ /*!
  * @since 1.1.0
- * @version 2.2.1
+ * @version 2.2.2
  */
@@ -16,0 +16,0 @@

No alert changes

Improved metrics

Total package byte prevSize

339586

increased by0.03%

Worsened metrics

Lines of code

7804

decreased by-0.03%

No dependency changes