ui: remove redundant columns from child job table (#17645)

Namespace, job type, and priority are already available from the parent
job header, so displaying them in the table caused it to be too crowded.
This commit is contained in:
Luiz Aoqui 2023-06-22 10:22:41 -04:00 committed by GitHub
parent 4e2d019639
commit 3d761e712b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 38 additions and 28 deletions

3
.changelog/17645.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:improvement
ui: remove namespace, type, and priority columns from child job table
```

View File

@ -46,23 +46,12 @@
<t.sort-by @prop="name"> <t.sort-by @prop="name">
Name Name
</t.sort-by> </t.sort-by>
{{#if this.system.shouldShowNamespaces}}
<t.sort-by @prop="namespace.name" data-test-jobs-namespace-header>
Namespace
</t.sort-by>
{{/if}}
<t.sort-by @prop="submitTime" data-test-jobs-submit-time-header> <t.sort-by @prop="submitTime" data-test-jobs-submit-time-header>
Submitted At Submitted At
</t.sort-by> </t.sort-by>
<t.sort-by @prop="status"> <t.sort-by @prop="status">
Status Status
</t.sort-by> </t.sort-by>
<t.sort-by @prop="type">
Type
</t.sort-by>
<t.sort-by @prop="priority">
Priority
</t.sort-by>
<th> <th>
Groups Groups
</th> </th>

View File

@ -4,7 +4,7 @@
~}} ~}}
<td data-test-job-name <td data-test-job-name
{{keyboard-shortcut {{keyboard-shortcut
enumerated=true enumerated=true
action=(action "gotoJob" @job) action=(action "gotoJob" @job)
}} }}
@ -25,10 +25,12 @@
</LinkTo> </LinkTo>
</td> </td>
{{#if this.system.shouldShowNamespaces}} {{#if (not (eq @context "child"))}}
<td data-test-job-namespace> {{#if this.system.shouldShowNamespaces}}
{{this.job.namespace.name}} <td data-test-job-namespace>
</td> {{this.job.namespace.name}}
</td>
{{/if}}
{{/if}} {{/if}}
{{#if (eq @context "child")}} {{#if (eq @context "child")}}
<td data-test-job-submit-time> <td data-test-job-submit-time>
@ -40,12 +42,14 @@
{{this.job.status}} {{this.job.status}}
</span> </span>
</td> </td>
<td data-test-job-type> {{#if (not (eq @context "child"))}}
{{this.job.displayType.type}} <td data-test-job-type>
</td> {{this.job.displayType.type}}
<td data-test-job-priority> </td>
{{this.job.priority}} <td data-test-job-priority>
</td> {{this.job.priority}}
</td>
{{/if}}
<td data-test-job-task-groups> <td data-test-job-task-groups>
{{#if this.job.taskGroupCount}} {{#if this.job.taskGroupCount}}
{{this.job.taskGroupCount}} {{this.job.taskGroupCount}}

View File

@ -171,6 +171,13 @@ moduleForJob(
) )
); );
}, },
"don't display redundant information in children table": async function (
job,
assert
) {
assert.notOk(JobDetail.jobsHeader.hasPriority);
assert.notOk(JobDetail.jobsHeader.hasType);
},
} }
); );
@ -186,9 +193,8 @@ moduleForJob(
return parent; return parent;
}, },
{ {
'display namespace in children table': async function (job, assert) { "don't display namespace in children table": async function (job, assert) {
assert.ok(JobDetail.jobsHeader.hasNamespace); assert.notOk(JobDetail.jobsHeader.hasNamespace);
assert.equal(JobDetail.jobs[0].namespace, job.namespace);
}, },
} }
); );
@ -216,6 +222,13 @@ moduleForJob(
) )
); );
}, },
"don't display redundant information in children table": async function (
job,
assert
) {
assert.notOk(JobDetail.jobsHeader.hasPriority);
assert.notOk(JobDetail.jobsHeader.hasType);
},
} }
); );
@ -231,9 +244,8 @@ moduleForJob(
return parent; return parent;
}, },
{ {
'display namespace in children table': async function (job, assert) { "don't display namespace in children table": async function (job, assert) {
assert.ok(JobDetail.jobsHeader.hasNamespace); assert.notOk(JobDetail.jobsHeader.hasNamespace);
assert.equal(JobDetail.jobs[0].namespace, job.namespace);
}, },
} }
); );

View File

@ -108,6 +108,8 @@ export default create({
scope: '[data-test-jobs-header]', scope: '[data-test-jobs-header]',
hasSubmitTime: isPresent('[data-test-jobs-submit-time-header]'), hasSubmitTime: isPresent('[data-test-jobs-submit-time-header]'),
hasNamespace: isPresent('[data-test-jobs-namespace-header]'), hasNamespace: isPresent('[data-test-jobs-namespace-header]'),
hasType: isPresent('[data-test-jobs-type-header]'),
hasPriority: isPresent('[data-test-jobs-priority-header]'),
}, },
jobs: collection('[data-test-job-row]', { jobs: collection('[data-test-job-row]', {