shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-22 13:33:52 +03:00
Code Releases Wiki Activity

B OpenNebula/one#6380: Fix multiple issues with image pool view (#2884)

Browse Source
This commit is contained in:
David 2024-01-04 18:41:10 +01:00 committed by GitHub
parent 9177157e2a
commit 53b0d9970c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/fireedge/src/client/components/Tables/Images/columns.js
View File

@ -18,9 +18,6 @@ import { CategoryFilter } from 'client/components/Tables/Enhanced/Utils'
import * as ImageModel from 'client/models/Image'
import { T } from 'client/constants'
const getTotalOfResources = (resources) =>
[resources?.ID ?? []].flat().length || 0
const COLUMNS = [
{ Header: 'ID', id: 'id', accessor: 'ID', sortType: 'number' },
{ Header: 'Name', id: 'name', accessor: 'NAME' },
@ -64,12 +61,6 @@ const COLUMNS = [
accessor: 'RUNNING_VMS',
sortType: 'number',
},
{
Header: 'Total VMs',
id: 'TOTAL_VMS',
accessor: (row) => getTotalOfResources(row?.VMS),
sortType: 'number',
},
]
COLUMNS.noFilterIds = ['id', 'name', 'type', 'label']

27
src/fireedge/src/client/components/Tables/Images/row.js
View File

@ -24,7 +24,6 @@ import {
Db as DatastoreIcon,
ModernTv,
Pin as PersistentIcon,
Archive as DiskTypeIcon,
} from 'iconoir-react'
import { Typography } from '@mui/material'
import MultipleTags from 'client/components/MultipleTags'
@ -53,11 +52,9 @@ const Row = ({ original, value, onClickLabel, ...props }) => {
GNAME,
REGTIME,
TYPE,
DISK_TYPE,
PERSISTENT,
locked,
DATASTORE,
TOTAL_VMS,
RUNNING_VMS,
label: LABELS = [],
} = value
@ -133,29 +130,13 @@ const Row = ({ original, value, onClickLabel, ...props }) => {
<DatastoreIcon />
<span>{` ${DATASTORE}`}</span>
</span>
<span
title={
PERSISTENT
? T.Persistent.toLowerCase()
: T.NonPersistent.toLowerCase()
}
>
<span title={+PERSISTENT ? T.Persistent : T.NonPersistent}>
<PersistentIcon />
<span>
{PERSISTENT
? T.Persistent.toLowerCase()
: T.NonPersistent.toLowerCase()}
</span>
<span>{+PERSISTENT ? T.Persistent : T.NonPersistent}</span>
</span>
<span title={`${T.DiskType}: ${DISK_TYPE.toLowerCase()}`}>
<DiskTypeIcon />
<span>{` ${DISK_TYPE.toLowerCase()}`}</span>
</span>
<span
title={`${T.Running} / ${T.Used} ${T.VMs}: ${RUNNING_VMS} / ${TOTAL_VMS}`}
>
<span title={`${T.VMs}: ${RUNNING_VMS}`}>
<ModernTv />
<span>{` ${RUNNING_VMS} / ${TOTAL_VMS}`}</span>
<span>{`${RUNNING_VMS}`}</span>
</span>
</div>
</div>