new model

Author: odeimaiz

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

@@ -22,41 +22,38 @@ qx.Class.define("osparc.data.Job", {
     this.base(arguments);
 
     this.set({
-      jobId: jobData["job_id"],
-      solver: jobData["solver"],
-      status: jobData["status"],
-      progress: jobData["progress"],
-      submittedAt: jobData["submitted_at"] ? new Date(jobData["submitted_at"]) : null,
-      startedAt: jobData["started_at"] ? new Date(jobData["started_at"]) : null,
-      instance: jobData["instance"],
+      projectUuid: jobData["projectUuid"],
+      state: jobData["state"],
+      submittedAt: jobData["submittedAt"] ? new Date(jobData["submittedAt"]) : null,
+      startedAt: jobData["startedAt"] ? new Date(jobData["startedAt"]) : null,
+      endedAt: jobData["endedAt"] ? new Date(jobData["endedAt"]) : null,
+      info: jobData["info"] || null,
     });
+
+    if (jobData["info"] && jobData["info"]["project_name"]) {
+      this.setProjectName(jobData["info"]["project_name"]);
+    }
   },
 
   properties: {
-    jobId: {
+    projectUuid: {
       check: "String",
       nullable: false,
       init: null,
     },
 
-    solver: {
+    projectName: {
       check: "String",
       nullable: false,
       init: null,
     },
 
-    status: {
+    state: {
       check: "String",
       nullable: false,
       init: null,
     },
 
-    progress: {
-      check: "Number",
-      init: null,
-      nullable: true,
-    },
-
     submittedAt: {
       check: "Date",
       init: null,
@@ -69,10 +66,10 @@ qx.Class.define("osparc.data.Job", {
       nullable: true,
     },
 
-    instance: {
-      check: "String",
-      nullable: false,
+    endedAt: {
+      check: "Date",
       init: null,
+      nullable: true,
     },
 
     info: {

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

@@ -324,7 +324,8 @@ qx.Class.define("osparc.data.Resources", {
         endpoints: {
           getPage: {
             method: "GET",
-            url: statics.API + "/computations/-/iterations/latest?offset={offset}&limit={limit}&order_by={orderBy}"
+            // url: statics.API + "/computations/-/iterations/latest?offset={offset}&limit={limit}&order_by={orderBy}"
+            url: statics.API + "/computations/-/iterations/latest?offset={offset}&limit={limit}&order_by=%7B%22field%22:%22submitted_at%22,%22direction%22:%22desc%22%7D"
           },
         }
       },

services/static-webserver/client/source/class/osparc/jobs/JobsButton.js

@@ -76,7 +76,7 @@ qx.Class.define("osparc.jobs.JobsButton", {
       const number = this.getChildControl("number");
 
       const jobsStore = osparc.store.Jobs.getInstance();
-      const nJobs = jobsStore.getJobs().length;
+      const nJobs = jobsStore.getJobs().length > 20 ? "20+" : jobsStore.getJobs().length;
       number.setValue(nJobs.toString());
       nJobs ? this.show() : this.exclude();
     },

services/static-webserver/client/source/class/osparc/jobs/JobsTable.js

@@ -32,7 +32,7 @@ qx.Class.define("osparc.jobs.JobsTable", {
     });
 
     const columnModel = this.getTableColumnModel();
-    columnModel.setColumnVisible(this.self().COLS.JOB_ID.column, true);
+    columnModel.setColumnVisible(this.self().COLS.PROJECT_UUID.column, false);
 
     Object.values(this.self().COLS).forEach(col => columnModel.setColumnWidth(col.column, col.width));
 
@@ -44,81 +44,73 @@ qx.Class.define("osparc.jobs.JobsTable", {
     const fontButtonRendererStop = new osparc.ui.table.cellrenderer.ImageButtonRenderer("stop", iconPathStop);
     columnModel.setDataCellRenderer(this.self().COLS.ACTION_STOP.column, fontButtonRendererStop);
 
-    const iconPathDelete = "osparc/trash-text.svg";
-    const fontButtonRendererDelete = new osparc.ui.table.cellrenderer.ImageButtonRenderer("delete", iconPathDelete);
-    columnModel.setDataCellRenderer(this.self().COLS.ACTION_DELETE.column, fontButtonRendererDelete);
-
-    const iconPathLogs = "osparc/logs-text.svg";
-    const fontButtonRendererLogs = new osparc.ui.table.cellrenderer.ImageButtonRenderer("logs", iconPathLogs);
-    columnModel.setDataCellRenderer(this.self().COLS.ACTION_LOGS.column, fontButtonRendererLogs);
-
     this.__attachHandlers();
   },
 
   statics: {
     COLS: {
-      JOB_ID: {
+      PROJECT_UUID: {
         id: "jobId",
         column: 0,
-        label: qx.locale.Manager.tr("Job Id"),
+        label: qx.locale.Manager.tr("Project Id"),
         width: 170
       },
-      SOLVER: {
-        id: "solver",
+      PROJECT_NAME: {
+        id: "projectName",
         column: 1,
-        label: qx.locale.Manager.tr("Solver"),
-        width: 100
+        label: qx.locale.Manager.tr("Project Name"),
+        width: 170
       },
-      STATUS: {
-        id: "status",
+      STATE: {
+        id: "state",
         column: 2,
-        label: qx.locale.Manager.tr("Status"),
+        label: qx.locale.Manager.tr("State"),
         width: 170
       },
-      PROGRESS: {
-        id: "progress",
-        column: 3,
-        label: qx.locale.Manager.tr("Progress"),
-        width: 80
-      },
       SUBMIT: {
         id: "submit",
-        column: 4,
+        column: 3,
         label: qx.locale.Manager.tr("Submitted"),
         width: 130
       },
       START: {
         id: "start",
-        column: 5,
+        column: 4,
         label: qx.locale.Manager.tr("Started"),
         width: 130
       },
+      END: {
+        id: "end",
+        column: 5,
+        label: qx.locale.Manager.tr("Ended"),
+        width: 130
+      },
       INFO: {
         id: "info",
         column: 6,
         label: qx.locale.Manager.tr("Info"),
         width: 40
       },
-      INSTANCE: {
-        id: "instance",
-        column: 7,
-        label: qx.locale.Manager.tr("Instance"),
-        width: 90
-      },
       ACTION_STOP: {
         id: "info",
+        column: 7,
+        label: "",
+        width: 40
+      },
+      ACTION_RUN: {
+        id: "action_run",
         column: 8,
         label: "",
         width: 40
       },
-      ACTION_DELETE: {
-        id: "info",
+      ACTION_RETRY: {
+        id: "action_retry",
         column: 9,
         label: "",
         width: 40
       },
-      ACTION_LOGS: {
-        id: "info",
+      ACTION_MORE: {
+        id: "action_more",
         column: 10,
         label: "",
         width: 40

services/static-webserver/client/source/class/osparc/jobs/JobsTableModel.js

@@ -19,24 +19,22 @@
 qx.Class.define("osparc.jobs.JobsTableModel", {
   extend: qx.ui.table.model.Remote,
 
-  construct(filters) {
+  construct() {
     this.base(arguments);
 
     const jobsCols = osparc.jobs.JobsTable.COLS;
     const colLabels = Object.values(jobsCols).map(col => col.label);
     const colIDs = Object.values(jobsCols).map(col => col.id);
     this.setColumns(colLabels, colIDs);
 
-    if (filters) {
-      this.setFilters(filters);
-    }
-
     this.setSortColumnIndexWithoutSortingData(jobsCols.SUBMIT.column);
     this.setSortAscendingWithoutSortingData(false);
+    this.setColumnSortable(jobsCols.STATE.column, false);
     this.setColumnSortable(jobsCols.INFO.column, false);
     this.setColumnSortable(jobsCols.ACTION_STOP.column, false);
-    this.setColumnSortable(jobsCols.ACTION_DELETE.column, false);
-    this.setColumnSortable(jobsCols.ACTION_LOGS.column, false);
+    this.setColumnSortable(jobsCols.ACTION_RUN.column, false);
+    this.setColumnSortable(jobsCols.ACTION_RETRY.column, false);
+    this.setColumnSortable(jobsCols.ACTION_MORE.column, false);
   },
 
   properties: {
@@ -46,84 +44,27 @@ qx.Class.define("osparc.jobs.JobsTableModel", {
       event: "changeFetching"
     },
 
-    filters: {
-      check: "Object",
-      init: null,
-      apply: "reloadData", // force reload
-    },
-
     orderBy: {
       check: "Object",
       init: {
-        field: "started_at",
+        field: "submitted_at",
         direction: "desc"
       }
     },
   },
 
-  statics: {
-    SERVER_MAX_LIMIT: 49,
-    COLUMN_ID_TO_DB_COLUMN_MAP: {
-      0: "started_at",
-    },
-  },
-
   members: {
-    // this should be done by the backend
-    __filterJobs: function(jobs) {
-      const filters = this.getFilters();
-      return jobs.filter(job => {
-        if (filters) {
-          let match = false;
-          [
-            "jobId",
-            "solver",
-            "status",
-            "instance",
-          ].forEach(filterableField => {
-            const getter = "get" + qx.lang.String.firstUp(filterableField);
-            const value = job[getter]();
-            // lowercase both
-            if (!match && value && value.toLowerCase().includes(filters.text.toLowerCase())) {
-              match = true;
-            }
-          });
-          return match;
-        }
-        return true;
-      });
-    },
-
-    // overridden
-    sortByColumn(columnIndex, ascending) {
-      this.setOrderBy({
-        field: this.self().COLUMN_ID_TO_DB_COLUMN_MAP[columnIndex],
-        direction: ascending ? "asc" : "desc"
-      })
-      this.base(arguments, columnIndex, ascending);
-    },
-
     // overridden
     _loadRowCount() {
-      const urlParams = {
-        offset: 0,
-        limit: 1,
-        filters: this.getFilters() ?
-          JSON.stringify({
-            "started_at": this.getFilters()
-          }) :
-          null,
-        orderBy: JSON.stringify(this.getOrderBy()),
-      };
-      const options = {
-        resolveWResponse: true
-      };
-      osparc.store.Jobs.getInstance().fetchJobs(urlParams, options)
+      const offset = 0;
+      const limit = 1;
+      osparc.store.Jobs.getInstance().fetchJobs(offset, limit, JSON.stringify(this.getOrderBy()))
         .then(jobs => {
-          const filteredJobs = this.__filterJobs(jobs);
-          this._onRowCountLoaded(filteredJobs.length);
+          this._onRowCountLoaded(jobs.length)
+        })
+        .catch(() => {
+          this._onRowCountLoaded(null)
         })
-        .catch(() => this._onRowCountLoaded(null));
     },
 
     // overridden
@@ -132,31 +73,19 @@ qx.Class.define("osparc.jobs.JobsTableModel", {
 
       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 urlParams = {
-          limit,
-          offset,
-          filters: this.getFilters() ?
-            JSON.stringify({
-              "started_at": this.getFilters()
-            }) :
-            null,
-          orderBy: JSON.stringify(this.getOrderBy())
-        };
-        return osparc.store.Jobs.getInstance().fetchJobs(urlParams)
+      const getFetchPromise = (offset, limit) => {
+        return osparc.store.Jobs.getInstance().fetchJobs(offset, limit, JSON.stringify(this.getOrderBy()))
           .then(jobs => {
-            const filteredJobs = this.__filterJobs(jobs);
             const data = [];
             const jobsCols = osparc.jobs.JobsTable.COLS;
-            filteredJobs.forEach(job => {
+            jobs.forEach(job => {
               data.push({
-                [jobsCols.JOB_ID.id]: job.getJobId(),
-                [jobsCols.SOLVER.id]: job.getSolver(),
-                [jobsCols.STATUS.id]: job.getStatus(),
-                [jobsCols.PROGRESS.id]: job.getProgress() ? (job.getProgress() + "%") : "-",
+                [jobsCols.PROJECT_UUID.id]: job.getProjectUuid(),
+                [jobsCols.PROJECT_NAME.id]: job.getProjectName(),
+                [jobsCols.STATE.id]: job.getState(),
                 [jobsCols.SUBMIT.id]: job.getSubmittedAt() ? osparc.utils.Utils.formatDateAndTime(job.getSubmittedAt()) : "-",
                 [jobsCols.START.id]: job.getStartedAt() ? osparc.utils.Utils.formatDateAndTime(job.getStartedAt()) : "-",
-                [jobsCols.INSTANCE.id]: job.getInstance(),
+                [jobsCols.START.id]: job.getEndedAt() ? osparc.utils.Utils.formatDateAndTime(job.getEndedAt()) : "-",
               });
             });
             return data;