Commit 1bf28408 authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch 'jivanvl-change-shared-runner-duration-field-groups' into 'master'

Change minutes field to shared_runners_duration

See merge request gitlab-org/gitlab!80197
parents 87c7c624 ee407a3d
...@@ -64,7 +64,7 @@ export default { ...@@ -64,7 +64,7 @@ export default {
.sort((a, b) => { .sort((a, b) => {
return new Date(a.monthIso8601) - new Date(b.monthIso8601); return new Date(a.monthIso8601) - new Date(b.monthIso8601);
}) })
.map((cur) => [formatDate(cur.monthIso8601, 'mmm yyyy'), cur.minutes]); .map((cur) => [formatDate(cur.monthIso8601, 'mmm yyyy'), cur.sharedRunnersDuration]);
}, },
isDataEmpty() { isDataEmpty() {
return this.minutesUsageDataByMonth.length === 0; return this.minutesUsageDataByMonth.length === 0;
......
...@@ -3,13 +3,7 @@ query getCiMinutesUsageByNamespace($namespaceId: NamespaceID) { ...@@ -3,13 +3,7 @@ query getCiMinutesUsageByNamespace($namespaceId: NamespaceID) {
nodes { nodes {
month month
monthIso8601 monthIso8601
minutes sharedRunnersDuration
projects {
nodes {
name
minutes
}
}
} }
} }
} }
...@@ -19,34 +19,25 @@ export const ciMinutesUsageNamespace = { ...@@ -19,34 +19,25 @@ export const ciMinutesUsageNamespace = {
{ {
month: 'December', month: 'December',
monthIso8601: '2021-12-01', monthIso8601: '2021-12-01',
minutes: 110, sharedRunnersDuration: 110,
projects: { nodes: [], __typename: 'CiMinutesProjectMonthlyUsageConnection' },
__typename: 'CiMinutesNamespaceMonthlyUsage', __typename: 'CiMinutesNamespaceMonthlyUsage',
}, },
{ {
month: 'November', month: 'November',
monthIso8601: '2021-11-01', monthIso8601: '2021-11-01',
minutes: 95, sharedRunnersDuration: 95,
projects: {
nodes: [
{ name: 'Html5 Boilerplate', minutes: 0, __typename: 'CiMinutesProjectMonthlyUsage' },
],
__typename: 'CiMinutesProjectMonthlyUsageConnection',
},
__typename: 'CiMinutesNamespaceMonthlyUsage', __typename: 'CiMinutesNamespaceMonthlyUsage',
}, },
{ {
month: 'October', month: 'October',
monthIso8601: '2021-10-01', monthIso8601: '2021-10-01',
minutes: 85, sharedRunnersDuration: 85,
projects: { nodes: [], __typename: 'CiMinutesProjectMonthlyUsageConnection' },
__typename: 'CiMinutesNamespaceMonthlyUsage', __typename: 'CiMinutesNamespaceMonthlyUsage',
}, },
{ {
month: 'September', month: 'September',
monthIso8601: '2021-09-01', monthIso8601: '2021-09-01',
minutes: 85, sharedRunnersDuration: 85,
projects: { nodes: [], __typename: 'CiMinutesProjectMonthlyUsageConnection' },
__typename: 'CiMinutesNamespaceMonthlyUsage', __typename: 'CiMinutesNamespaceMonthlyUsage',
}, },
], ],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment