Add conditions list to PVC detail page

rancher/rancher#30319
This commit is contained in:
Westly Wright 2020-12-03 11:46:47 -07:00
parent e8c96cdec3
commit bf8f5071b5
No known key found for this signature in database
GPG Key ID: 4FAB3D8673DC54A3
3 changed files with 41 additions and 32 deletions

View File

@ -10,12 +10,10 @@
}} }}
</div> </div>
{{/if}} {{/if}}
<h1> <h1>
{{title}} {{title}}
</h1> </h1>
</section> </section>
<div class="row"> <div class="row">
{{#if isView}} {{#if isView}}
{{#if model.description}} {{#if model.description}}
@ -38,7 +36,6 @@
}} }}
</div> </div>
{{/if}} {{/if}}
{{#if selectNamespace}} {{#if selectNamespace}}
<div class="col span-6"> <div class="col span-6">
{{form-namespace {{form-namespace
@ -50,7 +47,6 @@
</div> </div>
{{/if}} {{/if}}
</div> </div>
{{#if isView}} {{#if isView}}
{{#if primaryResource.storageClass}} {{#if primaryResource.storageClass}}
<div class="row"> <div class="row">
@ -67,7 +63,13 @@
{{t "cruPersistentVolumeClaim.storageClass.label"}} {{t "cruPersistentVolumeClaim.storageClass.label"}}
</label> </label>
<div> <div>
<a href="{{href-to "authenticated.cluster.storage.classes.detail.index" scope.currentCluster.id primaryResource.storageClass.id}}"> <a
href="{{href-to
"authenticated.cluster.storage.classes.detail.index"
scope.currentCluster.id
primaryResource.storageClass.id
}}"
>
{{primaryResource.storageClass.displayName}} {{primaryResource.storageClass.displayName}}
</a> </a>
</div> </div>
@ -88,7 +90,13 @@
{{t "cruPersistentVolumeClaim.pv.label"}} {{t "cruPersistentVolumeClaim.pv.label"}}
</label> </label>
<div> <div>
<a href="{{href-to "authenticated.cluster.storage.persistent-volumes.detail.index" scope.currentCluster.id primaryResource.persistentVolume.id}}"> <a
href="{{href-to
"authenticated.cluster.storage.persistent-volumes.detail.index"
scope.currentCluster.id
primaryResource.persistentVolume.id
}}"
>
{{primaryResource.persistentVolume.displayName}} {{primaryResource.persistentVolume.displayName}}
</a> </a>
</div> </div>
@ -113,10 +121,7 @@
</div> </div>
<div class="radio"> <div class="radio">
<label> <label>
{{radio-button {{radio-button selection=useStorageClass value=false}}
selection=useStorageClass
value=false
}}
{{t "cruPersistentVolumeClaim.source.pv"}} {{t "cruPersistentVolumeClaim.source.pv"}}
</label> </label>
</div> </div>
@ -135,15 +140,12 @@
required=true required=true
value=primaryResource.storageClassId value=primaryResource.storageClassId
}} }}
<label class="acc-label mt-20"> <label class="acc-label mt-20">
{{t "cruPersistentVolumeClaim.capacity.label"}}{{field-required editing=editing}} {{t "cruPersistentVolumeClaim.capacity.label"}}
{{field-required editing=editing}}
</label> </label>
<div class="input-group"> <div class="input-group">
{{input-number {{input-number classNames="form-control" value=capacity}}
classNames="form-control"
value=capacity
}}
<span class="input-group-addon bg-default"> <span class="input-group-addon bg-default">
{{t "cruPersistentVolumeClaim.capacity.unit"}} {{t "cruPersistentVolumeClaim.capacity.unit"}}
</span> </span>
@ -163,11 +165,16 @@
</div> </div>
</div> </div>
{{/if}} {{/if}}
<hr />
<hr/> {{#accordion-list showExpandAll=false as |al expandFn|}}
{{#accordion-list showExpandAll=false as | al expandFn |}}
{{#if isView}} {{#if isView}}
{{resource-condition-list
resourceType=(t "generic.persistentVolumeClaim")
conditions=model.status.conditions
expandAll=al.expandAll
expandFn=expandFn
expandOnInit=model.status.conditions
}}
{{form-related-workloads {{form-related-workloads
workloads=model.workloads workloads=model.workloads
expandAll=al.expandAll expandAll=al.expandAll
@ -183,10 +190,7 @@
}} }}
<div class="row"> <div class="row">
<div class="col span-6"> <div class="col span-6">
{{form-access-modes {{form-access-modes model=primaryResource mode=mode}}
model=primaryResource
mode=mode
}}
</div> </div>
</div> </div>
{{/accordion-list-item}} {{/accordion-list-item}}
@ -201,11 +205,14 @@
}} }}
{{/if}} {{/if}}
{{/accordion-list}} {{/accordion-list}}
{{#unless isView}} {{#unless isView}}
{{top-errors errors=errors}} {{top-errors errors=errors}}
{{save-cancel {{save-cancel
createLabel=(if actuallySave "saveCancel.create" "cruPersistentVolumeClaim.define.addActionLabel") createLabel=(if
actuallySave
"saveCancel.create"
"cruPersistentVolumeClaim.define.addActionLabel"
)
save=(action "save") save=(action "save")
cancel=(action "viewEditCancel") cancel=(action "viewEditCancel")
}} }}

View File

@ -8,6 +8,7 @@ export default Component.extend({
sortBy: 'type', sortBy: 'type',
descending: false, descending: false,
expandOnInit: false,
resourceType: null, resourceType: null,
headers: [ headers: [

View File

@ -1,6 +1,7 @@
{{#accordion-list-item {{#accordion-list-item
title=(t 'conditionSections.title') title=(t 'conditionSections.title')
detail=(t 'conditionSections.detail' resourceType=resourceType) detail=(t 'conditionSections.detail' resourceType=resourceType)
expandOnInit=expandOnInit
expandAll=expandAll expandAll=expandAll
expand=(action expandFn) expand=(action expandFn)
componentName='sortable-table' componentName='sortable-table'