1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-29 18:50:08 +03:00

Revert "B #6213: Filter datastores when exporting app (#2646)"

This reverts commit 722f919dc271488553b0b647fb171744f1bee21d.
This commit is contained in:
Tino Vázquez 2023-06-27 18:18:44 +02:00
parent 4bea6db969
commit ae886ec191
No known key found for this signature in database
GPG Key ID: 14201E424D02047E
2 changed files with 3 additions and 13 deletions

View File

@ -20,7 +20,7 @@ import { useFormContext } from 'react-hook-form'
import { DatastoresTable } from 'client/components/Tables'
import { SCHEMA } from 'client/components/Forms/MarketplaceApp/ExportForm/Steps/DatastoresTable/schema'
import { Step, decodeBase64 } from 'client/utils'
import { T, DATASTORE_TYPES } from 'client/constants'
import { T } from 'client/constants'
export const STEP_ID = 'datastore'
@ -52,13 +52,6 @@ const Content = ({ data, app }) => {
filters: [{ id: 'TYPE', value: isKernelType ? 'FILE' : 'IMAGE' }],
}}
onSelectedRowsChange={handleSelectedRows}
// Filter data by type IMAGE_DS B#6213 when export an app
filter={(dataToFilter) =>
dataToFilter.filter(
(datastore) =>
datastore?.TEMPLATE?.TYPE === DATASTORE_TYPES.IMAGE.value
)
}
/>
)
}

View File

@ -33,7 +33,7 @@ const DatastoresTable = (props) => {
const {
rootProps = {},
searchProps = {},
filter = (dataToFilter) => dataToFilter,
useQuery = useGetDatastoresQuery,
...rest
} = props ?? {}
rootProps['data-cy'] ??= DEFAULT_DATA_CY
@ -42,9 +42,6 @@ const DatastoresTable = (props) => {
const { view, getResourceView } = useViews()
const { data = [], isFetching, refetch } = useQuery()
// Filter data with input funcion called "filter"
const filteredData = filter(data)
const columns = useMemo(
() =>
createColumns({
@ -57,7 +54,7 @@ const DatastoresTable = (props) => {
return (
<EnhancedTable
columns={columns}
data={useMemo(() => filteredData, [filteredData])}
data={useMemo(() => data, [data])}
rootProps={rootProps}
searchProps={searchProps}
refetch={refetch}