[skip ci ]renaming

Author: odeimaiz

services/static-webserver/client/source/class/osparc/data/Resources.js

@@ -418,11 +418,11 @@ qx.Class.define("osparc.data.Resources", {
           },
           getWithWallet: {
             method: "GET",
-            url: statics.API + "/services/-/resource-usages?wallet_id={walletId}&offset={offset}&limit={limit}&filters={filters}&order_by={orderBy}"
+            url: statics.API + "/services/-/resource-usages?wallet_id={walletId}&offset={offset}&limit={limit}"
           },
-          getWithWallet2: {
+          getWithWalletFiltered: {
             method: "GET",
-            url: statics.API + "/services/-/resource-usages?wallet_id={walletId}&offset={offset}&limit={limit}"
+            url: statics.API + "/services/-/resource-usages?wallet_id={walletId}&offset={offset}&limit={limit}&filters={filters}&order_by={orderBy}"
           },
           getUsagePerService: {
             method: "GET",

services/static-webserver/client/source/class/osparc/desktop/credits/CurrentUsage.js

@@ -66,7 +66,7 @@ qx.Class.define("osparc.desktop.credits.CurrentUsage", {
             limit: 10
           }
         };
-        osparc.data.Resources.fetch("resourceUsage", "getWithWallet2", params)
+        osparc.data.Resources.fetch("resourceUsage", "getWithWallet", params)
           .then(data => {
             const currentTasks = data.filter(d => (d.project_id === currentStudy.getUuid()) && d.service_run_status === "RUNNING");
             let cost = 0;

services/static-webserver/client/source/class/osparc/desktop/credits/UsageTableModel.js

@@ -76,7 +76,7 @@ qx.Class.define("osparc.desktop.credits.UsageTableModel", {
 
     // overridden
     _loadRowCount() {
-      const endpoint = this.getWalletId() == null ? "get" : "getWithWallet"
+      const endpoint = this.getWalletId() == null ? "get" : "getWithWalletFiltered"
       const params = {
         url: {
           walletId: this.getWalletId(),
@@ -109,7 +109,7 @@ qx.Class.define("osparc.desktop.credits.UsageTableModel", {
       const lastRow = Math.min(qxLastRow, this._rowCount - 1)
       // Returns a request promise with given offset and limit
       const getFetchPromise = (offset, limit=this.self().SERVER_MAX_LIMIT) => {
-        const endpoint = this.getWalletId() == null ? "get" : "getWithWallet"
+        const endpoint = this.getWalletId() == null ? "get" : "getWithWalletFiltered"
         return osparc.data.Resources.fetch("resourceUsage", endpoint, {
           url: {
             walletId: this.getWalletId(),