openui5-fhir - npm Package Compare versions

Comparing version 1.1.1 to 1.1.2

CHANGELOG.md

@@ -0,1 +1,8 @@
+## [1.1.2](https://github.com/SAP/openui5-fhir/compare/v1.1.1...v1.1.2) (2020-06-24)
+
+
+### Bug Fixes
+
+* set the default query params based on configuration ([#142](https://github.com/SAP/openui5-fhir/issues/142)) ([08c9bea](https://github.com/SAP/openui5-fhir/commit/08c9bea8150d570f4455808f62595c5b8dad0943))
+
 ## [1.1.1](https://github.com/SAP/openui5-fhir/compare/v1.1.0...v1.1.1) (2020-06-24)
@@ -2,0 +9,0 @@

package.json

 {
   "name": "openui5-fhir",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "author": "SAP SE",
@@ -5,0 +5,0 @@ "license": "Apache-2.0",

src/sap/fhir/library.js

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

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

@@ -34,3 +34,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 1.1.1
+	 * @version 1.1.2
 	 *
@@ -37,0 +37,0 @@ * @see sap.fhir.model.r4.Context.create

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

@@ -36,3 +36,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 1.1.1
+	 * @version 1.1.2
 	 */
@@ -39,0 +39,0 @@ var FHIRContextBinding = ContextBinding.extend("sap.fhir.model.r4.FHIRContextBinding", {

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

@@ -21,3 +21,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 1.1.1
+	 * @version 1.1.2
 	 */
@@ -24,0 +24,0 @@ var FHIRFilterOperatorUtils = {};

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

@@ -25,3 +25,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 1.1.1
+	 * @version 1.1.2
 	 */
@@ -28,0 +28,0 @@ var FHIRFilterProcessor = {};

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

@@ -48,3 +48,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 1.1.1
+	 * @version 1.1.2
 	 */
@@ -51,0 +51,0 @@ var FHIRListBinding = ListBinding.extend("sap.fhir.model.r4.FHIRListBinding", {

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

@@ -64,2 +64,3 @@ /*!
 	 * @param {string} [mParameters.defaultFullUrlType='uuid'] The default FullUrlType if the default submit mode is either batch or transaction
+	 * @param {object} [mParameters.defaultQueryParameters={}] The default query parameters to be passed on resource type specific requests and not resource instance specific requests (e.g /Patient?_total:accurate&_format:json). It should be of type key:value pairs. e.g. {'_total':'accurate'} -> http://hl7.org/fhir/http.html#parameters
 	 * @param {string} [mParameters.Prefer='return=minimal'] The FHIR server won't return the changed resource by an POST/PUT request -> https://www.hl7.org/fhir/http.html#2.21.0.5.2
@@ -71,3 +72,3 @@ * @param {string} [mParameters.x-csrf-token=true] The model handles the csrf token between the browser and the FHIR server
 	 * @since 1.0.0
-	 * @version 1.1.1
+	 * @version 1.1.2
 	 */
@@ -89,3 +90,4 @@ var FHIRModel = Model.extend("sap.fhir.model.r4.FHIRModel", {
 			this._buildGroupProperties(mParameters);
-			this.oRequestor = new FHIRRequestor(sServiceUrl, this, mParameters && mParameters["x-csrf-token"], mParameters && mParameters.Prefer);
+			this.oDefaultQueryParameters = mParameters && mParameters.defaultQueryParameters && mParameters.defaultQueryParameters instanceof Object ? mParameters.defaultQueryParameters : {};
+			this.oRequestor = new FHIRRequestor(sServiceUrl, this, mParameters && mParameters["x-csrf-token"], mParameters && mParameters.Prefer, this.oDefaultQueryParameters);
 			this.sDefaultSubmitMode = (mParameters && mParameters.defaultSubmitMode) ? mParameters.defaultSubmitMode : SubmitMode.Direct;
@@ -92,0 +94,0 @@ this.sDefaultFullUrlType = (mParameters && mParameters.defaultSubmitMode && mParameters.defaultSubmitMode !== SubmitMode.Direct && mParameters.defaultFullUrlType) ? mParameters.defaultFullUrlType : "uuid";

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

@@ -33,3 +33,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 1.1.1
+	 * @version 1.1.2
 	 */
@@ -36,0 +36,0 @@ var FHIRPropertyBinding = PropertyBinding.extend("sap.fhir.model.r4.FHIRPropertyBinding", {

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

@@ -27,3 +27,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 1.1.1
+	 * @version 1.1.2
 	 */
@@ -30,0 +30,0 @@ var FHIRUtils = {};

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

@@ -31,3 +31,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 1.1.1
+	 * @version 1.1.2
 	 */
@@ -34,0 +34,0 @@ var BindingInfo = function(sResourceId, sResourceType, sResourcePath, sRelativePath, sAbsolutePath, aBinding, sGroupId, sRequestPath, aResourcePath, sResourceServerPath, sEtag) {

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

@@ -21,3 +21,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 1.1.1
+	 * @version 1.1.2
 	 */
@@ -24,0 +24,0 @@ var FHIRBundle = function(sBundleType, sGroupId) {

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

@@ -23,3 +23,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 1.1.1
+	 * @version 1.1.2
 	 */
@@ -26,0 +26,0 @@ var FHIRBundleEntry = function(sFullUrl, oResource, oRequest) {

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

@@ -31,3 +31,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 1.1.1
+	 * @version 1.1.2
 	 */
@@ -34,0 +34,0 @@ var FHIRBundleRequest = function(oBinding, sMethod, sUrl, fnSuccess, fnError, sIfMatch, sIfNoneMatch, sIfNoneExist, sIfModifiedSince) {

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

@@ -19,5 +19,6 @@ /*!
 	"sap/fhir/model/r4/lib/FHIRUrl",
-	"sap/base/util/each"
+	"sap/base/util/each",
+	"sap/base/util/merge"
 ], function(jQuery, FHIRUtils, SubmitMode, FHIRBundle,
-	FHIRBundleEntry, FHIRBundleRequest, FHIRBundleType, RequestHandle, HTTPMethod, FHIRUrl, each) {
+	FHIRBundleEntry, FHIRBundleRequest, FHIRBundleType, RequestHandle, HTTPMethod, FHIRUrl, each, merge) {
 	"use strict";
@@ -32,2 +33,3 @@
 	 * @param {string} sPrefer In which kind the FHIR service shall return the responses described here https://www.hl7.org/fhir/http.html#2.21.0.5.2
+	 * @param {object} oDefaultQueryParams The default query parameters to be passed on resource type specific requests and not resource instance specific requests (e.g /Patient?_total:accurate&_format:json). It should be of type key:value pairs. e.g. {'_total':'accurate'} -> http://hl7.org/fhir/http.html#parameters
 	 * @alias sap.fhir.model.r4.lib.FHIRRequestor
@@ -38,5 +40,5 @@ * @author SAP SE
 	 * @since 1.0.0
-	 * @version 1.1.1
+	 * @version 1.1.2
 	 */
-	var FHIRRequestor = function(sServiceUrl, oModel, bCSRF, sPrefer) {
+	var FHIRRequestor = function(sServiceUrl, oModel, bCSRF, sPrefer, oDefaultQueryParams) {
 		this._mBundleQueue = {};
@@ -48,2 +50,3 @@ this.oModel = oModel;
 		this.sPrefer = sPrefer ?  "return=minimal" : sPrefer;
+		this.oDefaultQueryParams = oDefaultQueryParams;
 		this._oRegex = {
@@ -429,6 +432,8 @@ rAmpersand : /&/g,
 
-		mParameters._format = "json";
+		if (!oBindingInfo.getResourceId() && sMethod === HTTPMethod.GET) {
+			mParameters = merge(mParameters, this.oDefaultQueryParams);
+		}
 
-		if (!oBindingInfo.getResourceId() && sMethod === HTTPMethod.GET){
-			mParameters._total = "accurate";
+		if (!this._isFormatSupported(mParameters._format)) {
+			mParameters._format = "json";
 		}
@@ -526,3 +531,20 @@
 
+	/**
+	 * Checks if the _format is part of supported types (according to fhir all these kinds shall be intrepreted as json)
+	 *
+	 * @param {string} sFormat The format in a particular request
+	 * @returns {boolean} Whether its supported or not
+	 * @private
+	 * @since 1.1.2
+	 */
+	FHIRRequestor.prototype._isFormatSupported = function(sFormat) {
+		var aSupportedFormats = [
+			"json",
+			"application/json",
+			"application/fhir+json"
+		];
+		return aSupportedFormats.indexOf(sFormat) >= 0;
+	};
+
 	return FHIRRequestor;
 });

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

@@ -22,3 +22,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 1.1.1
+	 * @version 1.1.2
 	 */
@@ -25,0 +25,0 @@ var FHIRUrl = function(sUrl, sServiceUrl) {

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

@@ -20,3 +20,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 1.1.1
+	 * @version 1.1.2
 	 */
@@ -23,0 +23,0 @@ var HTTPMethod = {

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

@@ -22,3 +22,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 1.1.1
+	 * @version 1.1.2
 	 */
@@ -25,0 +25,0 @@ var RequestHandle = function(oBinding) {

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

@@ -24,3 +24,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 1.1.1
+	 * @version 1.1.2
 	 */
@@ -27,0 +27,0 @@ var Sliceable = {};

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

@@ -20,3 +20,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 1.1.1
+	 * @version 1.1.2
 	 */
@@ -23,0 +23,0 @@ var OperationMode = {

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

@@ -19,3 +19,3 @@ /*!
 	 * @since 1.0.0
-	 * @version 1.1.1
+	 * @version 1.1.2
 	 */
@@ -22,0 +22,0 @@ var SubmitMode = {

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

@@ -18,3 +18,3 @@ /*!
  * @since 1.1.0
- * @version 1.1.1
+ * @version 1.1.2
  */
@@ -21,0 +21,0 @@

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

@@ -15,3 +15,3 @@ /*!
  * @since 1.1.0
- * @version 1.1.1
+ * @version 1.1.2
  */
@@ -18,0 +18,0 @@

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

@@ -15,3 +15,3 @@ /*!
  * @since 1.1.0
- * @version 1.1.1
+ * @version 1.1.2
  */
@@ -18,0 +18,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

304631

increased by0.61%

Lines of code

7262

increased by0.35%

No dependency changes