mapParams - replace mapPageToOffset calls with mapParams to also include sort

Author: himdel

src/api/base.ts

@@ -47,6 +47,14 @@ export class BaseAPI {
     return params;
   }
 
+  public mapParams(params) {
+    return {
+      params: this.mapSort(
+        this.mapPageToOffset ? this.mapPageToOffset(params) : params,
+      ),
+    };
+  }
+
   // The api uses sort/ordering/order_by for sort
   // the UI uses sort and maps to whatever the api expects
   // (set sortParam)
@@ -60,11 +68,7 @@ export class BaseAPI {
   }
 
   list(params?: object, apiPath?: string) {
-    return this.http.get(this.getPath(apiPath), {
-      params: this.mapSort(
-        this.mapPageToOffset ? this.mapPageToOffset(params) : params,
-      ),
-    });
+    return this.http.get(this.getPath(apiPath), this.mapParams(params));
   }
 
   get(id: string, apiPath?: string) {

src/api/collection-version.ts

@@ -33,7 +33,7 @@ export class API extends HubAPI {
   getUsedDependenciesByCollection(namespace, collection, params = {}) {
     return this.http.get(
       this.apiPath + `?dependency=${namespace}.${collection}`,
-      { params: this.mapPageToOffset(params) },
+      this.mapParams(params),
     );
   }
 

src/api/collection.ts

@@ -147,7 +147,7 @@ export class API extends HubAPI {
   getUsedDependenciesByCollection(namespace, collection, params = {}) {
     return this.http.get(
       `_ui/v1/collection-versions/?dependency=${namespace}.${collection}`,
-      { params: this.mapPageToOffset(params) },
+      this.mapParams(params),
     );
   }
 

src/api/execution-environment.ts

@@ -12,19 +12,21 @@ class API extends HubAPI {
   }
 
   images(name, params) {
-    return this.http.get(this.apiPath + `${name}/_content/images/`, {
-      params: this.mapPageToOffset(params),
-    });
+    return this.http.get(
+      this.apiPath + `${name}/_content/images/`,
+      this.mapParams(params),
+    );
   }
 
   image(name, digest) {
     return this.http.get(this.apiPath + `${name}/_content/images/${digest}/`);
   }
 
   tags(name, params) {
-    return this.http.get(this.apiPath + `${name}/_content/tags/`, {
-      params: this.mapPageToOffset(params),
-    });
+    return this.http.get(
+      this.apiPath + `${name}/_content/tags/`,
+      this.mapParams(params),
+    );
   }
 
   deleteImage(name, manifest) {