rancher
/
dashboard
mirror of https://github.com/rancher/dashboard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2285 from mantis-toboggan-md/bugfix-workload-detail-pods 

namespace workload pods method
This commit is contained in:
Vincent Fiduccia 2021-02-02 20:51:53 -07:00 committed by GitHub
parent 4599b067fd 3aabe7defe
commit 67c5979115
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
detail/workload/index.vue
View File

@ -2,7 +2,7 @@
import CreateEditView from '@/mixins/create-edit-view';
import { STATE, NAME, NODE, POD_IMAGES } from '@/config/table-headers';
import { POD, WORKLOAD_TYPES } from '@/config/types';
import ResourceTable from '@/components/ResourceTable';
import SortableTable from '@/components/SortableTable';
import Tab from '@/components/Tabbed/Tab';
import Loading from '@/components/Loading';
import ResourceTabs from '@/components/form/ResourceTabs';
@ -12,11 +12,11 @@ import { get } from '@/utils/object';
export default {
components: {
ResourceTable,
Tab,
Loading,
ResourceTabs,
CountGauge
CountGauge,
SortableTable
},
mixins: [CreateEditView],
@ -207,7 +207,7 @@ export default {
</div>
<ResourceTabs :value="value">
<Tab v-if="jobs && jobs.length" name="jobs" :label="t('tableHeaders.jobs')">
<ResourceTable
<SortableTable
:rows="jobs"
:headers="jobHeaders"
key-field="id"
@ -217,7 +217,7 @@ export default {
/>
</Tab>
<Tab v-else-if="pods && pods.length" name="pods" :label="t('tableHeaders.pods')">
<ResourceTable
<SortableTable
v-if="pods"
:rows="pods"
:headers="podHeaders"

2
models/workload.js
View File

@ -224,7 +224,7 @@ export default {
pods = await this.$dispatch('cluster/findMatching', { type: POD, selector: podRelationship.selector }, { root: true });
}
return pods;
return pods.filter(pod => pod.metadata.namespace === this.metadata.namespace);
};
},