From d086b59778301fcd3323ac3dc5a5a8109dfdfd20 Mon Sep 17 00:00:00 2001 From: Lennart Klose Date: Wed, 20 Mar 2024 10:48:35 +0100 Subject: [PATCH 1/2] Hotfix query param generation for objects --- packages/core/src/http/axios-follow-hal-json.spec.ts | 1 + packages/core/src/http/axios-follow-hal-json.ts | 4 ++++ packages/dms/test.txt | 2 ++ 3 files changed, 7 insertions(+) create mode 100644 packages/dms/test.txt diff --git a/packages/core/src/http/axios-follow-hal-json.spec.ts b/packages/core/src/http/axios-follow-hal-json.spec.ts index 29d84548..8b2d8f99 100644 --- a/packages/core/src/http/axios-follow-hal-json.spec.ts +++ b/packages/core/src/http/axios-follow-hal-json.spec.ts @@ -154,6 +154,7 @@ describe("axiosFollowHalJsonFunctionFactory", () => { { url: "/test{?test1}", templates: { "test1": ["hi"] }, expectedUrl: "/test", expectedParams: { "test1": "[\"hi\"]" } }, { url: "/test{?test1}", templates: { "test1": ["hi", "ho"] }, expectedUrl: "/test", expectedParams: { "test1": "[\"hi\",\"ho\"]" } }, { url: "/test{?test1,test2}", templates: { "test1": ["hi", "ho"], "test2": ["1", "2"] }, expectedUrl: "/test", expectedParams: { "test1": "[\"hi\",\"ho\"]", "test2": "[\"1\",\"2\"]" } }, + { url: "/test{?test1,test2}", templates: { "test1": { "hi": "ho" }, "test2": { "1": "2" } }, expectedUrl: "/test", expectedParams: { "test1": "{\"hi\":\"ho\"}", "test2": "{\"1\":\"2\"}" } }, { url: "a{B}c{D}e", templates: { D: "d" }, expectedUrl: "acde" }, { url: "a{B}c{D}e", templates: {}, expectedUrl: "ace" }, diff --git a/packages/core/src/http/axios-follow-hal-json.ts b/packages/core/src/http/axios-follow-hal-json.ts index a38ac3d2..fc2ac048 100644 --- a/packages/core/src/http/axios-follow-hal-json.ts +++ b/packages/core/src/http/axios-follow-hal-json.ts @@ -61,6 +61,10 @@ function templateUrl(url: string, originalParams: { [key: string]: string | unde let value: any = templates[key]; + if (typeof value === "object" && !Array.isArray(value)) { + value = JSON.stringify(value); + } + if (Array.isArray(value)) { if (value.length > 0) { value = JSON.stringify(templates[key]); diff --git a/packages/dms/test.txt b/packages/dms/test.txt new file mode 100644 index 00000000..1bf77a97 --- /dev/null +++ b/packages/dms/test.txt @@ -0,0 +1,2 @@ +https://able-group-dev.d-velop.cloud/dms/r/1a2cde3f-2913-3dc2-4a2e-e623459ac23a/srm?sourceid=/able-pageneric/sources/default&sourceproperties[AA_documentType][0]=ZR03T01D01&sourceproperties[AA_personnelArea][0]=ID&sourcecategories=["XPWFL"] +https://able-group-dev.d-velop.cloud/dms/r/1a2cde3f-2913-3dc2-4a2e-e623459ac23a/srm?sourceid=/able-pageneric/sources/default&sourceproperties={"AA_documentType":["ZR03T01D01"],"AA_personnelArea":["ID"]}&sourcecategories=["XPWFL"] \ No newline at end of file From b9cc4ec921f0967d97509add24168a6cc7d7653b Mon Sep 17 00:00:00 2001 From: Lennart Klose Date: Wed, 20 Mar 2024 10:50:16 +0100 Subject: [PATCH 2/2] Raise versions --- package-lock.json | 20 ++++++++++---------- packages/core/package.json | 2 +- packages/dms/package.json | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 56f12f90..a108fecf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2975,9 +2975,9 @@ "license": "ISC" }, "node_modules/follow-redirects": { - "version": "1.15.5", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", - "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", "funding": [ { "type": "individual", @@ -7206,7 +7206,7 @@ }, "packages/core": { "name": "@dvelop-sdk/core", - "version": "2.1.3", + "version": "2.1.4", "license": "Apache-2.0", "dependencies": { "axios": "^0.28.0", @@ -7243,10 +7243,10 @@ }, "packages/dms": { "name": "@dvelop-sdk/dms", - "version": "1.5.2", + "version": "1.5.3", "license": "Apache-2.0", "dependencies": { - "@dvelop-sdk/core": "^2.1.3" + "@dvelop-sdk/core": "^2.1.4" } }, "packages/express-utils": { @@ -7683,7 +7683,7 @@ "@dvelop-sdk/dms": { "version": "file:packages/dms", "requires": { - "@dvelop-sdk/core": "^2.1.3" + "@dvelop-sdk/core": "^2.1.4" } }, "@dvelop-sdk/express-utils": { @@ -9414,9 +9414,9 @@ "dev": true }, "follow-redirects": { - "version": "1.15.5", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", - "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==" + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==" }, "form-data": { "version": "3.0.1", diff --git a/packages/core/package.json b/packages/core/package.json index aa50ea20..a505223e 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,7 +1,7 @@ { "name": "@dvelop-sdk/core", "description": "This package contains shared functionality for the @dvelop-sdk packages.", - "version": "2.1.3", + "version": "2.1.4", "license": "Apache-2.0", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/dms/package.json b/packages/dms/package.json index f7d4b17d..864be8b8 100644 --- a/packages/dms/package.json +++ b/packages/dms/package.json @@ -1,7 +1,7 @@ { "name": "@dvelop-sdk/dms", "description": "This package contains functionality for the DMS-App in the d.velop cloud.", - "version": "1.5.2", + "version": "1.5.3", "license": "Apache-2.0", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -23,6 +23,6 @@ "license": "license-checker --production --onlyAllow Apache-2.0;MIT;ISC;BSD-2-Clause;BSD-3-Clause" }, "dependencies": { - "@dvelop-sdk/core": "^2.1.3" + "@dvelop-sdk/core": "^2.1.4" } }