Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🎨 [Frontend] Expose tags in Usage table #6961

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+18 −10
Open

🎨 [Frontend] Expose tags in Usage table #6961

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af5d4b8
[skip ci ]renaming
odeimaiz Dec 13, 2024
bc4d187
minor fix
odeimaiz Dec 13, 2024
37d30e7
expose project_tags
odeimaiz Dec 13, 2024
ccb398f
Merge branch 'master' into enh/show-tags-in-usage
odeimaiz Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion services/static-webserver/client/source/class/osparc/dashboard/CardBase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ qx.Class.define("osparc.dashboard.CardBase", {

filterText: function(checks, text) {
if (text) {
const includesSome = checks.some(check => check.toLowerCase().trim().includes(text.toLowerCase()));
const includesSome = checks.some(check => check && check.toLowerCase().trim().includes(text.toLowerCase()));
return !includesSome;
}
return false;
Expand Down
6 changes: 3 additions & 3 deletions services/static-webserver/client/source/class/osparc/data/Resources.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion services/static-webserver/client/source/class/osparc/desktop/credits/CurrentUsage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 7 additions & 1 deletion services/static-webserver/client/source/class/osparc/desktop/credits/UsageTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,13 @@ qx.Class.define("osparc.desktop.credits.UsageTable", {
column: 7,
label: qx.locale.Manager.tr("User"),
width: 140
}
},
TAGS: {
id: "tags",
column: 7,
label: qx.locale.Manager.tr("Tags"),
width: 140
},
}
}
});
10 changes: 6 additions & 4 deletions services/static-webserver/client/source/class/osparc/desktop/credits/UsageTableModel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ qx.Class.define("osparc.desktop.credits.UsageTableModel", {
// 4: (not used) SORTING BY DURATION
5: "service_run_status",
6: "credit_cost",
7: "user_email"
7: "user_email",
8: "projects_tags",
}
},

Expand All @@ -76,7 +77,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(),
Expand Down Expand Up @@ -109,7 +110,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(),
Expand Down Expand Up @@ -149,7 +150,8 @@ qx.Class.define("osparc.desktop.credits.UsageTableModel", {
[usageCols.DURATION.id]: duration,
[usageCols.STATUS.id]: qx.lang.String.firstUp(rawRow["service_run_status"].toLowerCase()),
[usageCols.COST.id]: rawRow["credit_cost"] ? parseFloat(rawRow["credit_cost"]).toFixed(2) : "",
[usageCols.USER.id]: rawRow["user_email"]
[usageCols.USER.id]: rawRow["user_email"],
[usageCols.TAGS.id]: rawRow["project_tags"],
})
})
return data
Expand Down
Loading