Skip to content

Commit

Permalink
ui: fix CI (#11785)
Browse files Browse the repository at this point in the history
  • Loading branch information
lgfa29 committed Jan 6, 2022
1 parent eacdc63 commit f34e76a
Show file tree
Hide file tree
Showing 5 changed files with 151 additions and 343 deletions.
8 changes: 4 additions & 4 deletions ui/app/controllers/jobs/job/task-group.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import classic from 'ember-classic-decorator';

@classic
export default class TaskGroupController extends Controller.extend(
Sortable,
Searchable,
WithNamespaceResetting
) {
Sortable,
Searchable,
WithNamespaceResetting
) {
@service userSettings;
@service can;

Expand Down
156 changes: 47 additions & 109 deletions ui/app/templates/csi/volumes/volume.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,191 +3,129 @@
{{/each}}
{{page-title "CSI Volume " this.model.name}}
<section class="section with-headspace">
<h1 class="title" data-test-title>
{{this.model.name}}
</h1>
<h1 class="title" data-test-title>{{this.model.name}}</h1>

<div class="boxed-section is-small">
<div class="boxed-section-body inline-definitions">
<span class="label">
Volume Details
</span>
<span class="label">Volume Details</span>
<span class="pair" data-test-volume-health>
<span class="term">
Health
</span>
<span class="term">Health</span>
{{if this.model.schedulable "Schedulable" "Unschedulable"}}
</span>
<span class="pair" data-test-volume-provider>
<span class="term">
Provider
</span>
<span class="term">Provider</span>
{{this.model.provider}}
</span>
<span class="pair" data-test-volume-external-id>
<span class="term">
External ID
</span>
<span class="term">External ID</span>
{{this.model.externalId}}
</span>
{{#if this.system.shouldShowNamespaces}}
<span class="pair" data-test-volume-namespace>
<span class="term">
Namespace
</span>
<span class="term">Namespace</span>
{{this.model.namespace.name}}
</span>
{{/if}}
</div>
</div>

<div class="boxed-section">
<div class="boxed-section-head">
Write Allocations
</div>
<div class="boxed-section-body {{if this.model.writeAllocations.length "is-full-bleed"}}">
{{#if this.model.writeAllocations.length}}
<ListTable @source={{this.sortedWriteAllocations}} @class="with-foot" as |t|>
<ListTable
@source={{this.sortedWriteAllocations}}
@class="with-foot" as |t|>
<t.head>
<th class="is-narrow"></th>
<th>
ID
</th>
<th>
Created
</th>
<th>
Modified
</th>
<th>
Status
</th>
<th>
Client
</th>
<th>
Job
</th>
<th>
Version
</th>
<th>
CPU
</th>
<th>
Memory
</th>
<th>ID</th>
<th>Created</th>
<th>Modified</th>
<th>Status</th>
<th>Client</th>
<th>Job</th>
<th>Version</th>
<th>CPU</th>
<th>Memory</th>
</t.head>
<t.body as |row|>
<AllocationRow
@data-test-write-allocation={{row.model.id}}
@allocation={{row.model}}
@context="volume"
@onClick={{action "gotoAllocation" row.model}}
/>
@onClick={{action "gotoAllocation" row.model}} />
</t.body>
</ListTable>
{{else}}
<div class="empty-message" data-test-empty-write-allocations>
<h3 class="empty-message-headline" data-test-empty-write-allocations-headline>
No Write Allocations
</h3>
<p class="empty-message-body" data-test-empty-write-allocations-message>
No allocations are depending on this volume for read/write access.
</p>
<h3 class="empty-message-headline" data-test-empty-write-allocations-headline>No Write Allocations</h3>
<p class="empty-message-body" data-test-empty-write-allocations-message>No allocations are depending on this volume for read/write access.</p>
</div>
{{/if}}
</div>
</div>

<div class="boxed-section">
<div class="boxed-section-head">
Read Allocations
</div>
<div class="boxed-section-body {{if this.model.readAllocations.length "is-full-bleed"}}">
{{#if this.model.readAllocations.length}}
<ListTable @source={{this.sortedReadAllocations}} @class="with-foot" as |t|>
<ListTable
@source={{this.sortedReadAllocations}}
@class="with-foot" as |t|>
<t.head>
<th class="is-narrow"></th>
<th>
ID
</th>
<th>
Modified
</th>
<th>
Created
</th>
<th>
Status
</th>
<th>
Client
</th>
<th>
Job
</th>
<th>
Version
</th>
<th>
CPU
</th>
<th>
Memory
</th>
<th>ID</th>
<th>Modified</th>
<th>Created</th>
<th>Status</th>
<th>Client</th>
<th>Job</th>
<th>Version</th>
<th>CPU</th>
<th>Memory</th>
</t.head>
<t.body as |row|>
<AllocationRow
@data-test-read-allocation={{row.model.id}}
@allocation={{row.model}}
@context="volume"
@onClick={{action "gotoAllocation" row.model}}
/>
@onClick={{action "gotoAllocation" row.model}} />
</t.body>
</ListTable>
{{else}}
<div class="empty-message" data-test-empty-read-allocations>
<h3 class="empty-message-headline" data-test-empty-read-allocations-headline>
No Read Allocations
</h3>
<p class="empty-message-body" data-test-empty-read-allocations-message>
No allocations are depending on this volume for read-only access.
</p>
<h3 class="empty-message-headline" data-test-empty-read-allocations-headline>No Read Allocations</h3>
<p class="empty-message-body" data-test-empty-read-allocations-message>No allocations are depending on this volume for read-only access.</p>
</div>
{{/if}}
</div>
</div>

<div class="boxed-section">
<div class="boxed-section-head">
Constraints
</div>
<div class="boxed-section-body is-full-bleed">
<table class="table">
<thead>
<th>
Setting
</th>
<th>
Value
</th>
<th>Setting</th>
<th>Value</th>
</thead>
<tbody>
<tr>
<td>
Access Mode
</td>
<td data-test-access-mode>
{{this.model.accessMode}}
</td>
<td>Access Mode</td>
<td data-test-access-mode>{{this.model.accessMode}}</td>
</tr>
<tr>
<td>
Attachment Mode
</td>
<td data-test-attachment-mode>
{{this.model.attachmentMode}}
</td>
<td>Attachment Mode</td>
<td data-test-attachment-mode>{{this.model.attachmentMode}}</td>
</tr>
</tbody>
</table>
</div>
</div>
</section>
</section>
Loading

0 comments on commit f34e76a

Please sign in to comment.