Encode query parameters in H5GroveProvider

silx-kit · Aug 5, 2021 · 9bd0489 · 9bd0489
1 parent 6ea9269
commit 9bd0489
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/h5web/providers/h5grove/h5grove-api.ts b/src/h5web/providers/h5grove/h5grove-api.ts
@@ -10,7 +10,7 @@ import {
   ProviderError,
 } from '../models';
 import { ProviderApi } from '../api';
-import { isDatasetResponse, isGroupResponse } from './utils';
+import { encodeQueryParams, isDatasetResponse, isGroupResponse } from './utils';
 import type {
   H5GroveAttrValuesResponse,
   H5GroveDataResponse,
@@ -50,7 +50,7 @@ export class H5GroveApi extends ProviderApi {
     const { data } = await handleAxiosError(
       () =>
         this.client.get<H5GroveEntityResponse>(
-          `/meta/?file=${this.filepath}&path=${path}`
+          `/meta/?${encodeQueryParams({ file: this.filepath, path })}`
         ),
       404,
       ProviderError.NotFound
@@ -69,7 +69,7 @@ export class H5GroveApi extends ProviderApi {
     }
 
     const { data } = await this.client.get<H5GroveAttrValuesResponse>(
-      `/attr/?file=${this.filepath}&path=${path}`
+      `/attr/?${encodeQueryParams({ file: this.filepath, path })}`
     );
 
     this.attrValuesCache.set(path, data);
@@ -79,11 +79,8 @@ export class H5GroveApi extends ProviderApi {
   private async fetchData(
     params: ValueRequestParams
   ): Promise<H5GroveDataResponse> {
-    const { path, selection = '' } = params;
     const { data } = await this.cancellableFetchValue<H5GroveDataResponse>(
-      `/data/?file=${this.filepath}&path=${path}${
-        selection && `&selection=${selection}`
-      }`,
+      `/data/?${encodeQueryParams({ file: this.filepath, ...params })}`,
       params
     );
     return data;

diff --git a/src/h5web/providers/h5grove/utils.ts b/src/h5web/providers/h5grove/utils.ts
@@ -16,3 +16,7 @@ export function isDatasetResponse(
 ): response is H5GroveDatasetReponse {
   return response.type === EntityKind.Dataset;
 }
+
+export function encodeQueryParams(params: Record<string, string>) {
+  return new URLSearchParams(params).toString();
+}