@beinformed/ui 1.63.0 → 1.63.2

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [1.63.2](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.63.1...v1.63.2) (2025-08-21)
+
+
+### Bug Fixes
+
+* **server-request:** properly encode multi value options ([35cc4c9](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/35cc4c9b5ec1fdcba7295c8f61ff1b7239500dfc))
+* **server-request:** use URLSearchParam for proper encoding ([d43ab03](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/d43ab03636b9031d0d0cda4b624f3f137d1dc828))
+
+## [1.63.1](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.63.0...v1.63.1) (2025-07-04)
+
+
+### Bug Fixes
+
+* **server-request:** escape querystring ([d39da26](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/d39da267eb9dc695718001fead168350ad542cec))
+
 ## [1.63.0](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.62.8...v1.63.0) (2025-07-02)
 
 

package/esm/react-server/__tests__/requestInformation.spec.js.flow

@@ -92,7 +92,7 @@ describe("requestInformation", () => {
         queryString: "q=hello world&filter=test",
       });
       expect(getFullRequestUrl(request)).toBe(
-        "/search?q%3Dhello%20world%26filter%3Dtest",
+        "/search?q=hello+world&filter=test",
       );
     });
 
@@ -120,7 +120,7 @@ describe("requestInformation", () => {
         queryString: "name=John Doe & email=john@example.com",
       });
       expect(getFullRequestUrl(request)).toBe(
-        "/api/data?name%3DJohn%20Doe%20%26%20email%3Djohn%40example.com",
+        "/api/data?name=John+Doe+&+email=john%40example.com",
       );
     });
 
@@ -144,24 +144,25 @@ describe("requestInformation", () => {
       // Verify that Href constructor was called with the correct URL
       expect(require("../../models/href/Href")).toHaveBeenCalledTimes(1);
       expect(require("../../models/href/Href")).toHaveBeenCalledWith(
-        "/products?id%3D123",
+        "/products?id=123",
       );
 
       // Verify the returned object is an instance of the mock Href
-      expect(hrefInstance.url).toBe("/products?id%3D123");
+      expect(hrefInstance.url).toBe("/products?id=123");
     });
 
     it("should handle complex URLs and pass them to Href", () => {
       const request = createMockRequest({
         pathInfo: "/search/results",
-        queryString: "q=javascript%20xss&param=value",
+        queryString:
+          "q=javascript%20xss&param=value&multi=option%201%2Coption2,option3",
       });
       const hrefInstance = getFullRequestHref(request);
       expect(require("../../models/href/Href")).toHaveBeenCalledWith(
-        "/search/results?q%3Djavascript%2520xss%26param%3Dvalue",
+        "/search/results?q=javascript+xss&param=value&multi=option+1%2Coption2%2Coption3",
       );
       expect(hrefInstance.url).toBe(
-        "/search/results?q%3Djavascript%2520xss%26param%3Dvalue",
+        "/search/results?q=javascript+xss&param=value&multi=option+1%2Coption2%2Coption3",
       );
     });
   });

package/esm/react-server/requestInformation.js

@@ -1,5 +1,20 @@
+import _URLSearchParams from "@babel/runtime-corejs3/core-js-stable/url-search-params";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
 import Href from "../models/href/Href";
+/**
+ */
+const encodeQueryString = queryString => {
+  if (!queryString) return "";
+
+  // Create a URLSearchParams object from the existing query string
+  // It handles all the splitting, decoding, and special characters automatically.
+  const params = new _URLSearchParams(queryString);
+
+  // Return the encoded query string
+  // toString() correctly re-encodes everything.
+  return params.toString();
+};
+
 /**
  */
 export const getFullRequestUrl = request => {
@@ -8,7 +23,7 @@ export const getFullRequestUrl = request => {
   let queryString = request.getQueryString();
   pathInfo = _mapInstanceProperty(_context = pathInfo.split("/")).call(_context, segment => encodeURIComponent(segment)).join("/");
   if (queryString) {
-    return `${pathInfo}?${encodeURIComponent(queryString)}`;
+    return `${pathInfo}?${encodeQueryString(queryString)}`;
   }
   return pathInfo;
 };

package/esm/react-server/requestInformation.js.flow

@@ -3,6 +3,20 @@ import Href from "../models/href/Href";
 
 import type Locales from "../i18n/Locales";
 
+/**
+ */
+const encodeQueryString = (queryString: string) => {
+  if (!queryString) return "";
+
+  // Create a URLSearchParams object from the existing query string
+  // It handles all the splitting, decoding, and special characters automatically.
+  const params = new URLSearchParams(queryString);
+
+  // Return the encoded query string
+  // toString() correctly re-encodes everything.
+  return params.toString();
+};
+
 /**
  */
 export const getFullRequestUrl = (request: HttpServletRequestJava): string => {
@@ -15,7 +29,7 @@ export const getFullRequestUrl = (request: HttpServletRequestJava): string => {
     .join("/");
 
   if (queryString) {
-    return `${pathInfo}?${encodeURIComponent(queryString)}`;
+    return `${pathInfo}?${encodeQueryString(queryString)}`;
   }
 
   return pathInfo;

package/esm/react-server/requestInformation.js.map

@@ -1 +1 @@
-{"version":3,"file":"requestInformation.js","names":["Href","getFullRequestUrl","request","_context","pathInfo","getPathInfo","queryString","getQueryString","_mapInstanceProperty","split","call","segment","encodeURIComponent","join","getFullRequestHref","getCookieFromRequest","cookieName","getCookieByName","getPreferredLocale","locales","languageFromCookie","acceptLanguageHeader","getHeader","availableLocaleCodes"],"sources":["../../src/react-server/requestInformation.js"],"sourcesContent":["// @flow\nimport Href from \"../models/href/Href\";\n\nimport type Locales from \"../i18n/Locales\";\n\n/**\n */\nexport const getFullRequestUrl = (request: HttpServletRequestJava): string => {\n  let pathInfo = request.getPathInfo() || \"/\";\n  let queryString = request.getQueryString();\n\n  pathInfo = pathInfo\n    .split(\"/\")\n    .map((segment) => encodeURIComponent(segment))\n    .join(\"/\");\n\n  if (queryString) {\n    return `${pathInfo}?${encodeURIComponent(queryString)}`;\n  }\n\n  return pathInfo;\n};\n\n/**\n */\nexport const getFullRequestHref = (request: HttpServletRequestJava): Href =>\n  new Href(getFullRequestUrl(request));\n\n/**\n */\nexport const getCookieFromRequest = (\n  request: HttpServletRequestJava,\n  cookieName: string,\n): null | string => {\n  return request.getCookieByName(cookieName);\n};\n\n/**\n */\nexport const getPreferredLocale = (\n  request: HttpServletRequestJava,\n  locales: Locales,\n): void | string => {\n  const languageFromCookie = getCookieFromRequest(request, \"locale\");\n  const acceptLanguageHeader =\n    languageFromCookie || request.getHeader(\"Accept-Language\");\n\n  // when no accept language header or cookie present, get first locale code\n  if (acceptLanguageHeader === null) {\n    return locales.availableLocaleCodes[0];\n  }\n\n  return locales.getPreferredLocale(acceptLanguageHeader);\n};\n"],"mappings":";AACA,OAAOA,IAAI,MAAM,qBAAqB;AAItC;AACA;AACA,OAAO,MAAMC,iBAAiB,GAAIC,OAA+B,IAAa;EAAA,IAAAC,QAAA;EAC5E,IAAIC,QAAQ,GAAGF,OAAO,CAACG,WAAW,CAAC,CAAC,IAAI,GAAG;EAC3C,IAAIC,WAAW,GAAGJ,OAAO,CAACK,cAAc,CAAC,CAAC;EAE1CH,QAAQ,GAAGI,oBAAA,CAAAL,QAAA,GAAAC,QAAQ,CAChBK,KAAK,CAAC,GAAG,CAAC,EAAAC,IAAA,CAAAP,QAAA,EACLQ,OAAO,IAAKC,kBAAkB,CAACD,OAAO,CAAC,CAAC,CAC7CE,IAAI,CAAC,GAAG,CAAC;EAEZ,IAAIP,WAAW,EAAE;IACf,OAAO,GAAGF,QAAQ,IAAIQ,kBAAkB,CAACN,WAAW,CAAC,EAAE;EACzD;EAEA,OAAOF,QAAQ;AACjB,CAAC;;AAED;AACA;AACA,OAAO,MAAMU,kBAAkB,GAAIZ,OAA+B,IAChE,IAAIF,IAAI,CAACC,iBAAiB,CAACC,OAAO,CAAC,CAAC;;AAEtC;AACA;AACA,OAAO,MAAMa,oBAAoB,GAAGA,CAClCb,OAA+B,EAC/Bc,UAAkB,KACA;EAClB,OAAOd,OAAO,CAACe,eAAe,CAACD,UAAU,CAAC;AAC5C,CAAC;;AAED;AACA;AACA,OAAO,MAAME,kBAAkB,GAAGA,CAChChB,OAA+B,EAC/BiB,OAAgB,KACE;EAClB,MAAMC,kBAAkB,GAAGL,oBAAoB,CAACb,OAAO,EAAE,QAAQ,CAAC;EAClE,MAAMmB,oBAAoB,GACxBD,kBAAkB,IAAIlB,OAAO,CAACoB,SAAS,CAAC,iBAAiB,CAAC;;EAE5D;EACA,IAAID,oBAAoB,KAAK,IAAI,EAAE;IACjC,OAAOF,OAAO,CAACI,oBAAoB,CAAC,CAAC,CAAC;EACxC;EAEA,OAAOJ,OAAO,CAACD,kBAAkB,CAACG,oBAAoB,CAAC;AACzD,CAAC","ignoreList":[]}
+{"version":3,"file":"requestInformation.js","names":["Href","encodeQueryString","queryString","params","_URLSearchParams","toString","getFullRequestUrl","request","_context","pathInfo","getPathInfo","getQueryString","_mapInstanceProperty","split","call","segment","encodeURIComponent","join","getFullRequestHref","getCookieFromRequest","cookieName","getCookieByName","getPreferredLocale","locales","languageFromCookie","acceptLanguageHeader","getHeader","availableLocaleCodes"],"sources":["../../src/react-server/requestInformation.js"],"sourcesContent":["// @flow\nimport Href from \"../models/href/Href\";\n\nimport type Locales from \"../i18n/Locales\";\n\n/**\n */\nconst encodeQueryString = (queryString: string) => {\n  if (!queryString) return \"\";\n\n  // Create a URLSearchParams object from the existing query string\n  // It handles all the splitting, decoding, and special characters automatically.\n  const params = new URLSearchParams(queryString);\n\n  // Return the encoded query string\n  // toString() correctly re-encodes everything.\n  return params.toString();\n};\n\n/**\n */\nexport const getFullRequestUrl = (request: HttpServletRequestJava): string => {\n  let pathInfo = request.getPathInfo() || \"/\";\n  let queryString = request.getQueryString();\n\n  pathInfo = pathInfo\n    .split(\"/\")\n    .map((segment) => encodeURIComponent(segment))\n    .join(\"/\");\n\n  if (queryString) {\n    return `${pathInfo}?${encodeQueryString(queryString)}`;\n  }\n\n  return pathInfo;\n};\n\n/**\n */\nexport const getFullRequestHref = (request: HttpServletRequestJava): Href =>\n  new Href(getFullRequestUrl(request));\n\n/**\n */\nexport const getCookieFromRequest = (\n  request: HttpServletRequestJava,\n  cookieName: string,\n): null | string => {\n  return request.getCookieByName(cookieName);\n};\n\n/**\n */\nexport const getPreferredLocale = (\n  request: HttpServletRequestJava,\n  locales: Locales,\n): void | string => {\n  const languageFromCookie = getCookieFromRequest(request, \"locale\");\n  const acceptLanguageHeader =\n    languageFromCookie || request.getHeader(\"Accept-Language\");\n\n  // when no accept language header or cookie present, get first locale code\n  if (acceptLanguageHeader === null) {\n    return locales.availableLocaleCodes[0];\n  }\n\n  return locales.getPreferredLocale(acceptLanguageHeader);\n};\n"],"mappings":";;AACA,OAAOA,IAAI,MAAM,qBAAqB;AAItC;AACA;AACA,MAAMC,iBAAiB,GAAIC,WAAmB,IAAK;EACjD,IAAI,CAACA,WAAW,EAAE,OAAO,EAAE;;EAE3B;EACA;EACA,MAAMC,MAAM,GAAG,IAAAC,gBAAA,CAAoBF,WAAW,CAAC;;EAE/C;EACA;EACA,OAAOC,MAAM,CAACE,QAAQ,CAAC,CAAC;AAC1B,CAAC;;AAED;AACA;AACA,OAAO,MAAMC,iBAAiB,GAAIC,OAA+B,IAAa;EAAA,IAAAC,QAAA;EAC5E,IAAIC,QAAQ,GAAGF,OAAO,CAACG,WAAW,CAAC,CAAC,IAAI,GAAG;EAC3C,IAAIR,WAAW,GAAGK,OAAO,CAACI,cAAc,CAAC,CAAC;EAE1CF,QAAQ,GAAGG,oBAAA,CAAAJ,QAAA,GAAAC,QAAQ,CAChBI,KAAK,CAAC,GAAG,CAAC,EAAAC,IAAA,CAAAN,QAAA,EACLO,OAAO,IAAKC,kBAAkB,CAACD,OAAO,CAAC,CAAC,CAC7CE,IAAI,CAAC,GAAG,CAAC;EAEZ,IAAIf,WAAW,EAAE;IACf,OAAO,GAAGO,QAAQ,IAAIR,iBAAiB,CAACC,WAAW,CAAC,EAAE;EACxD;EAEA,OAAOO,QAAQ;AACjB,CAAC;;AAED;AACA;AACA,OAAO,MAAMS,kBAAkB,GAAIX,OAA+B,IAChE,IAAIP,IAAI,CAACM,iBAAiB,CAACC,OAAO,CAAC,CAAC;;AAEtC;AACA;AACA,OAAO,MAAMY,oBAAoB,GAAGA,CAClCZ,OAA+B,EAC/Ba,UAAkB,KACA;EAClB,OAAOb,OAAO,CAACc,eAAe,CAACD,UAAU,CAAC;AAC5C,CAAC;;AAED;AACA;AACA,OAAO,MAAME,kBAAkB,GAAGA,CAChCf,OAA+B,EAC/BgB,OAAgB,KACE;EAClB,MAAMC,kBAAkB,GAAGL,oBAAoB,CAACZ,OAAO,EAAE,QAAQ,CAAC;EAClE,MAAMkB,oBAAoB,GACxBD,kBAAkB,IAAIjB,OAAO,CAACmB,SAAS,CAAC,iBAAiB,CAAC;;EAE5D;EACA,IAAID,oBAAoB,KAAK,IAAI,EAAE;IACjC,OAAOF,OAAO,CAACI,oBAAoB,CAAC,CAAC,CAAC;EACxC;EAEA,OAAOJ,OAAO,CAACD,kBAAkB,CAACG,oBAAoB,CAAC;AACzD,CAAC","ignoreList":[]}

package/lib/react-server/requestInformation.js

@@ -5,8 +5,23 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getPreferredLocale = exports.getFullRequestUrl = exports.getFullRequestHref = exports.getCookieFromRequest = void 0;
+var _urlSearchParams = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/url-search-params"));
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
 var _Href = _interopRequireDefault(require("../models/href/Href"));
+/**
+ */
+const encodeQueryString = queryString => {
+  if (!queryString) return "";
+
+  // Create a URLSearchParams object from the existing query string
+  // It handles all the splitting, decoding, and special characters automatically.
+  const params = new _urlSearchParams.default(queryString);
+
+  // Return the encoded query string
+  // toString() correctly re-encodes everything.
+  return params.toString();
+};
+
 /**
  */
 const getFullRequestUrl = request => {
@@ -15,7 +30,7 @@ const getFullRequestUrl = request => {
   let queryString = request.getQueryString();
   pathInfo = (0, _map.default)(_context = pathInfo.split("/")).call(_context, segment => encodeURIComponent(segment)).join("/");
   if (queryString) {
-    return `${pathInfo}?${encodeURIComponent(queryString)}`;
+    return `${pathInfo}?${encodeQueryString(queryString)}`;
   }
   return pathInfo;
 };

package/lib/react-server/requestInformation.js.map

@@ -1 +1 @@
-{"version":3,"file":"requestInformation.js","names":["_Href","_interopRequireDefault","require","getFullRequestUrl","request","_context","pathInfo","getPathInfo","queryString","getQueryString","_map","default","split","call","segment","encodeURIComponent","join","exports","getFullRequestHref","Href","getCookieFromRequest","cookieName","getCookieByName","getPreferredLocale","locales","languageFromCookie","acceptLanguageHeader","getHeader","availableLocaleCodes"],"sources":["../../src/react-server/requestInformation.js"],"sourcesContent":["// @flow\nimport Href from \"../models/href/Href\";\n\nimport type Locales from \"../i18n/Locales\";\n\n/**\n */\nexport const getFullRequestUrl = (request: HttpServletRequestJava): string => {\n  let pathInfo = request.getPathInfo() || \"/\";\n  let queryString = request.getQueryString();\n\n  pathInfo = pathInfo\n    .split(\"/\")\n    .map((segment) => encodeURIComponent(segment))\n    .join(\"/\");\n\n  if (queryString) {\n    return `${pathInfo}?${encodeURIComponent(queryString)}`;\n  }\n\n  return pathInfo;\n};\n\n/**\n */\nexport const getFullRequestHref = (request: HttpServletRequestJava): Href =>\n  new Href(getFullRequestUrl(request));\n\n/**\n */\nexport const getCookieFromRequest = (\n  request: HttpServletRequestJava,\n  cookieName: string,\n): null | string => {\n  return request.getCookieByName(cookieName);\n};\n\n/**\n */\nexport const getPreferredLocale = (\n  request: HttpServletRequestJava,\n  locales: Locales,\n): void | string => {\n  const languageFromCookie = getCookieFromRequest(request, \"locale\");\n  const acceptLanguageHeader =\n    languageFromCookie || request.getHeader(\"Accept-Language\");\n\n  // when no accept language header or cookie present, get first locale code\n  if (acceptLanguageHeader === null) {\n    return locales.availableLocaleCodes[0];\n  }\n\n  return locales.getPreferredLocale(acceptLanguageHeader);\n};\n"],"mappings":";;;;;;;;AACA,IAAAA,KAAA,GAAAC,sBAAA,CAAAC,OAAA;AAIA;AACA;AACO,MAAMC,iBAAiB,GAAIC,OAA+B,IAAa;EAAA,IAAAC,QAAA;EAC5E,IAAIC,QAAQ,GAAGF,OAAO,CAACG,WAAW,CAAC,CAAC,IAAI,GAAG;EAC3C,IAAIC,WAAW,GAAGJ,OAAO,CAACK,cAAc,CAAC,CAAC;EAE1CH,QAAQ,GAAG,IAAAI,IAAA,CAAAC,OAAA,EAAAN,QAAA,GAAAC,QAAQ,CAChBM,KAAK,CAAC,GAAG,CAAC,EAAAC,IAAA,CAAAR,QAAA,EACLS,OAAO,IAAKC,kBAAkB,CAACD,OAAO,CAAC,CAAC,CAC7CE,IAAI,CAAC,GAAG,CAAC;EAEZ,IAAIR,WAAW,EAAE;IACf,OAAO,GAAGF,QAAQ,IAAIS,kBAAkB,CAACP,WAAW,CAAC,EAAE;EACzD;EAEA,OAAOF,QAAQ;AACjB,CAAC;;AAED;AACA;AADAW,OAAA,CAAAd,iBAAA,GAAAA,iBAAA;AAEO,MAAMe,kBAAkB,GAAId,OAA+B,IAChE,IAAIe,aAAI,CAAChB,iBAAiB,CAACC,OAAO,CAAC,CAAC;;AAEtC;AACA;AADAa,OAAA,CAAAC,kBAAA,GAAAA,kBAAA;AAEO,MAAME,oBAAoB,GAAGA,CAClChB,OAA+B,EAC/BiB,UAAkB,KACA;EAClB,OAAOjB,OAAO,CAACkB,eAAe,CAACD,UAAU,CAAC;AAC5C,CAAC;;AAED;AACA;AADAJ,OAAA,CAAAG,oBAAA,GAAAA,oBAAA;AAEO,MAAMG,kBAAkB,GAAGA,CAChCnB,OAA+B,EAC/BoB,OAAgB,KACE;EAClB,MAAMC,kBAAkB,GAAGL,oBAAoB,CAAChB,OAAO,EAAE,QAAQ,CAAC;EAClE,MAAMsB,oBAAoB,GACxBD,kBAAkB,IAAIrB,OAAO,CAACuB,SAAS,CAAC,iBAAiB,CAAC;;EAE5D;EACA,IAAID,oBAAoB,KAAK,IAAI,EAAE;IACjC,OAAOF,OAAO,CAACI,oBAAoB,CAAC,CAAC,CAAC;EACxC;EAEA,OAAOJ,OAAO,CAACD,kBAAkB,CAACG,oBAAoB,CAAC;AACzD,CAAC;AAACT,OAAA,CAAAM,kBAAA,GAAAA,kBAAA","ignoreList":[]}
+{"version":3,"file":"requestInformation.js","names":["_Href","_interopRequireDefault","require","encodeQueryString","queryString","params","_urlSearchParams","default","toString","getFullRequestUrl","request","_context","pathInfo","getPathInfo","getQueryString","_map","split","call","segment","encodeURIComponent","join","exports","getFullRequestHref","Href","getCookieFromRequest","cookieName","getCookieByName","getPreferredLocale","locales","languageFromCookie","acceptLanguageHeader","getHeader","availableLocaleCodes"],"sources":["../../src/react-server/requestInformation.js"],"sourcesContent":["// @flow\nimport Href from \"../models/href/Href\";\n\nimport type Locales from \"../i18n/Locales\";\n\n/**\n */\nconst encodeQueryString = (queryString: string) => {\n  if (!queryString) return \"\";\n\n  // Create a URLSearchParams object from the existing query string\n  // It handles all the splitting, decoding, and special characters automatically.\n  const params = new URLSearchParams(queryString);\n\n  // Return the encoded query string\n  // toString() correctly re-encodes everything.\n  return params.toString();\n};\n\n/**\n */\nexport const getFullRequestUrl = (request: HttpServletRequestJava): string => {\n  let pathInfo = request.getPathInfo() || \"/\";\n  let queryString = request.getQueryString();\n\n  pathInfo = pathInfo\n    .split(\"/\")\n    .map((segment) => encodeURIComponent(segment))\n    .join(\"/\");\n\n  if (queryString) {\n    return `${pathInfo}?${encodeQueryString(queryString)}`;\n  }\n\n  return pathInfo;\n};\n\n/**\n */\nexport const getFullRequestHref = (request: HttpServletRequestJava): Href =>\n  new Href(getFullRequestUrl(request));\n\n/**\n */\nexport const getCookieFromRequest = (\n  request: HttpServletRequestJava,\n  cookieName: string,\n): null | string => {\n  return request.getCookieByName(cookieName);\n};\n\n/**\n */\nexport const getPreferredLocale = (\n  request: HttpServletRequestJava,\n  locales: Locales,\n): void | string => {\n  const languageFromCookie = getCookieFromRequest(request, \"locale\");\n  const acceptLanguageHeader =\n    languageFromCookie || request.getHeader(\"Accept-Language\");\n\n  // when no accept language header or cookie present, get first locale code\n  if (acceptLanguageHeader === null) {\n    return locales.availableLocaleCodes[0];\n  }\n\n  return locales.getPreferredLocale(acceptLanguageHeader);\n};\n"],"mappings":";;;;;;;;;AACA,IAAAA,KAAA,GAAAC,sBAAA,CAAAC,OAAA;AAIA;AACA;AACA,MAAMC,iBAAiB,GAAIC,WAAmB,IAAK;EACjD,IAAI,CAACA,WAAW,EAAE,OAAO,EAAE;;EAE3B;EACA;EACA,MAAMC,MAAM,GAAG,IAAAC,gBAAA,CAAAC,OAAA,CAAoBH,WAAW,CAAC;;EAE/C;EACA;EACA,OAAOC,MAAM,CAACG,QAAQ,CAAC,CAAC;AAC1B,CAAC;;AAED;AACA;AACO,MAAMC,iBAAiB,GAAIC,OAA+B,IAAa;EAAA,IAAAC,QAAA;EAC5E,IAAIC,QAAQ,GAAGF,OAAO,CAACG,WAAW,CAAC,CAAC,IAAI,GAAG;EAC3C,IAAIT,WAAW,GAAGM,OAAO,CAACI,cAAc,CAAC,CAAC;EAE1CF,QAAQ,GAAG,IAAAG,IAAA,CAAAR,OAAA,EAAAI,QAAA,GAAAC,QAAQ,CAChBI,KAAK,CAAC,GAAG,CAAC,EAAAC,IAAA,CAAAN,QAAA,EACLO,OAAO,IAAKC,kBAAkB,CAACD,OAAO,CAAC,CAAC,CAC7CE,IAAI,CAAC,GAAG,CAAC;EAEZ,IAAIhB,WAAW,EAAE;IACf,OAAO,GAAGQ,QAAQ,IAAIT,iBAAiB,CAACC,WAAW,CAAC,EAAE;EACxD;EAEA,OAAOQ,QAAQ;AACjB,CAAC;;AAED;AACA;AADAS,OAAA,CAAAZ,iBAAA,GAAAA,iBAAA;AAEO,MAAMa,kBAAkB,GAAIZ,OAA+B,IAChE,IAAIa,aAAI,CAACd,iBAAiB,CAACC,OAAO,CAAC,CAAC;;AAEtC;AACA;AADAW,OAAA,CAAAC,kBAAA,GAAAA,kBAAA;AAEO,MAAME,oBAAoB,GAAGA,CAClCd,OAA+B,EAC/Be,UAAkB,KACA;EAClB,OAAOf,OAAO,CAACgB,eAAe,CAACD,UAAU,CAAC;AAC5C,CAAC;;AAED;AACA;AADAJ,OAAA,CAAAG,oBAAA,GAAAA,oBAAA;AAEO,MAAMG,kBAAkB,GAAGA,CAChCjB,OAA+B,EAC/BkB,OAAgB,KACE;EAClB,MAAMC,kBAAkB,GAAGL,oBAAoB,CAACd,OAAO,EAAE,QAAQ,CAAC;EAClE,MAAMoB,oBAAoB,GACxBD,kBAAkB,IAAInB,OAAO,CAACqB,SAAS,CAAC,iBAAiB,CAAC;;EAE5D;EACA,IAAID,oBAAoB,KAAK,IAAI,EAAE;IACjC,OAAOF,OAAO,CAACI,oBAAoB,CAAC,CAAC,CAAC;EACxC;EAEA,OAAOJ,OAAO,CAACD,kBAAkB,CAACG,oBAAoB,CAAC;AACzD,CAAC;AAACT,OAAA,CAAAM,kBAAA,GAAAA,kBAAA","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.63.0",
+  "version": "1.63.2",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "https://support.beinformed.com",

package/src/react-server/__tests__/requestInformation.spec.js

@@ -92,7 +92,7 @@ describe("requestInformation", () => {
         queryString: "q=hello world&filter=test",
       });
       expect(getFullRequestUrl(request)).toBe(
-        "/search?q%3Dhello%20world%26filter%3Dtest",
+        "/search?q=hello+world&filter=test",
       );
     });
 
@@ -120,7 +120,7 @@ describe("requestInformation", () => {
         queryString: "name=John Doe & email=john@example.com",
       });
       expect(getFullRequestUrl(request)).toBe(
-        "/api/data?name%3DJohn%20Doe%20%26%20email%3Djohn%40example.com",
+        "/api/data?name=John+Doe+&+email=john%40example.com",
       );
     });
 
@@ -144,24 +144,25 @@ describe("requestInformation", () => {
       // Verify that Href constructor was called with the correct URL
       expect(require("../../models/href/Href")).toHaveBeenCalledTimes(1);
       expect(require("../../models/href/Href")).toHaveBeenCalledWith(
-        "/products?id%3D123",
+        "/products?id=123",
       );
 
       // Verify the returned object is an instance of the mock Href
-      expect(hrefInstance.url).toBe("/products?id%3D123");
+      expect(hrefInstance.url).toBe("/products?id=123");
     });
 
     it("should handle complex URLs and pass them to Href", () => {
       const request = createMockRequest({
         pathInfo: "/search/results",
-        queryString: "q=javascript%20xss&param=value",
+        queryString:
+          "q=javascript%20xss&param=value&multi=option%201%2Coption2,option3",
       });
       const hrefInstance = getFullRequestHref(request);
       expect(require("../../models/href/Href")).toHaveBeenCalledWith(
-        "/search/results?q%3Djavascript%2520xss%26param%3Dvalue",
+        "/search/results?q=javascript+xss&param=value&multi=option+1%2Coption2%2Coption3",
       );
       expect(hrefInstance.url).toBe(
-        "/search/results?q%3Djavascript%2520xss%26param%3Dvalue",
+        "/search/results?q=javascript+xss&param=value&multi=option+1%2Coption2%2Coption3",
       );
     });
   });

package/src/react-server/requestInformation.js

@@ -3,6 +3,20 @@ import Href from "../models/href/Href";
 
 import type Locales from "../i18n/Locales";
 
+/**
+ */
+const encodeQueryString = (queryString: string) => {
+  if (!queryString) return "";
+
+  // Create a URLSearchParams object from the existing query string
+  // It handles all the splitting, decoding, and special characters automatically.
+  const params = new URLSearchParams(queryString);
+
+  // Return the encoded query string
+  // toString() correctly re-encodes everything.
+  return params.toString();
+};
+
 /**
  */
 export const getFullRequestUrl = (request: HttpServletRequestJava): string => {
@@ -15,7 +29,7 @@ export const getFullRequestUrl = (request: HttpServletRequestJava): string => {
     .join("/");
 
   if (queryString) {
-    return `${pathInfo}?${encodeURIComponent(queryString)}`;
+    return `${pathInfo}?${encodeQueryString(queryString)}`;
   }
 
   return pathInfo;