Merge branch 'master' into feature/localized-chats

Author: odeimaiz

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

@@ -46,7 +46,7 @@ qx.Class.define("osparc.desktop.credits.CreditsSummary", {
     WIDTH: 350,
     TIME_RANGES: [{
       key: 1,
-      label: "Today"
+      label: "Last 24h"
     }, {
       key: 7,
       label: "Last week"
@@ -116,8 +116,8 @@ qx.Class.define("osparc.desktop.credits.CreditsSummary", {
             const trItem = new qx.ui.form.ListItem(tr.label, null, tr.key);
             control.add(trItem);
           });
-          // default one week
-          const found = control.getSelectables().find(trItem => trItem.getModel() === 7);
+          // default last 24h
+          const found = control.getSelectables().find(trItem => trItem.getModel() === 1);
           if (found) {
             control.setSelection([found]);
           }

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

@@ -21,11 +21,25 @@ qx.Class.define("osparc.desktop.credits.DateFilters", {
   members: {
     _buildLayout() {
       this._removeAll();
-      const defaultFrom = new Date()
-      defaultFrom.setMonth(defaultFrom.getMonth() - 1)
-      // Range defaults to previous month
+
+      // Range defaults: today
+      const defaultFrom = new Date();
+      const defaultTo = new Date();
+
       this.__from = this.__addDateInput("From", defaultFrom);
-      this.__until = this.__addDateInput("Until");
+      this.__until = this.__addDateInput("Until", defaultTo);
+
+      const todayBtn = new qx.ui.form.Button("Today").set({
+        allowStretchY: false,
+        alignY: "bottom"
+      });
+      todayBtn.addListener("execute", () => {
+        const today = new Date();
+        this.__from.setValue(today);
+        this.__until.setValue(today);
+      });
+      this._add(todayBtn);
+
       const lastWeekBtn = new qx.ui.form.Button("Last week").set({
         allowStretchY: false,
         alignY: "bottom"
@@ -38,6 +52,7 @@ qx.Class.define("osparc.desktop.credits.DateFilters", {
         this.__until.setValue(today);
       });
       this._add(lastWeekBtn);
+
       const lastMonthBtn = new qx.ui.form.Button("Last month").set({
         allowStretchY: false,
         alignY: "bottom"
@@ -50,6 +65,7 @@ qx.Class.define("osparc.desktop.credits.DateFilters", {
         this.__until.setValue(today);
       });
       this._add(lastMonthBtn);
+
       const lastYearBtn = new qx.ui.form.Button("Last year").set({
         allowStretchY: false,
         alignY: "bottom"

services/static-webserver/client/source/class/osparc/store/Services.js

@@ -349,10 +349,15 @@ qx.Class.define("osparc.store.Services", {
     },
 
     getPricingPlan: function(serviceKey, serviceVersion) {
-      const serviceUrl = osparc.data.Resources.getServiceUrl(serviceKey, serviceVersion)
+      const serviceUrl = osparc.data.Resources.getServiceUrl(serviceKey, serviceVersion);
+      const key = serviceUrl["key"];
+      const version = serviceUrl["version"];
       // check if the service is already cached
-      if (serviceUrl in this.__pricingPlansCached) {
-        return Promise.resolve(this.__pricingPlansCached[serviceUrl]);
+      if (
+        key in this.__pricingPlansCached &&
+        version in this.__pricingPlansCached[key]
+      ) {
+        return Promise.resolve(this.__pricingPlansCached[key][version]);
       }
 
       const plansParams = {
@@ -361,7 +366,10 @@ qx.Class.define("osparc.store.Services", {
       return osparc.data.Resources.fetch("services", "pricingPlans", plansParams)
         .then(pricingPlansData => {
           // store the fetched pricing plans in the cache
-          this.__pricingPlansCached[serviceUrl] = pricingPlansData;
+          if (!(key in this.__pricingPlansCached)) {
+            this.__pricingPlansCached[key] = {};
+          }
+          this.__pricingPlansCached[key][version] = pricingPlansData;
           return pricingPlansData;
         });
     },

tests/e2e-playwright/tests/sleepers/test_sleepers.py

@@ -170,6 +170,7 @@ def test_sleepers(
             RunningState.WAITING_FOR_CLUSTER,
             RunningState.WAITING_FOR_RESOURCES,
             RunningState.STARTED,
+            RunningState.SUCCESS,
         ),
         timeout_ms=_WAITING_FOR_PIPELINE_TO_CHANGE_STATE,
     )