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

[ui] Two small UI quality of life changes #19377

Merged
merged 3 commits into from
Dec 8, 2023
Merged

[ui] Two small UI quality of life changes #19377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6da65b4
Jobs index without groups
philrenaud Dec 7, 2023
ddebe5d
Download button only appears if you have content in your template
philrenaud Dec 7, 2023
8b07999
No longer need to test for the group count in jobs index
philrenaud Dec 8, 2023
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
3 changes: 3 additions & 0 deletions .changelog/19377.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
ui: dont allow new jobspec download until template is populated, and remove group count from jobs index
```
2 changes: 1 addition & 1 deletion ui/app/templates/components/job-editor/edit.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,6 @@
@text="Save as .nomad.hcl"
@color="secondary"
{{on "click" @fns.onSaveFile}}

disabled={{not @data.job._newDefinition}}
/>
</Hds::ButtonSet>
3 changes: 0 additions & 3 deletions ui/app/templates/components/job-page/parts/children.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@
<t.sort-by @prop="status">
Status
</t.sort-by>
<th>
Groups
</th>
<th class="is-3">
Summary
</th>
Expand Down
7 changes: 0 additions & 7 deletions ui/app/templates/components/job-row.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,6 @@
{{this.job.priority}}
</td>
{{/if}}
<td data-test-job-task-groups>
{{#if this.job.taskGroupCount}}
{{this.job.taskGroupCount}}
{{else}}
--
{{/if}}
</td>
<td data-test-job-allocations>
<div class="inline-chart">
{{#if this.job.hasChildren}}
Expand Down
3 changes: 0 additions & 3 deletions ui/app/templates/jobs/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,6 @@
<t.sort-by @prop="priority">
Priority
</t.sort-by>
<th>
Groups
</th>
<th class="is-3">
Summary
</th>
Expand Down
2 changes: 0 additions & 2 deletions ui/tests/acceptance/jobs-list-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ module('Acceptance | jobs list', function (hooks) {
test('each job row should contain information about the job', async function (assert) {
server.createList('job', 2);
const job = server.db.jobs.sortBy('modifyIndex').reverse()[0];
const taskGroups = server.db.taskGroups.where({ jobId: job.id });

await JobsList.visit();

Expand All @@ -76,7 +75,6 @@ module('Acceptance | jobs list', function (hooks) {
assert.equal(jobRow.status, job.status, 'Status');
assert.equal(jobRow.type, typeForJob(job), 'Type');
assert.equal(jobRow.priority, job.priority, 'Priority');
assert.equal(jobRow.taskGroups, taskGroups.length, '# Groups');
});

test('each job row should link to the corresponding job', async function (assert) {
Expand Down
Loading