shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

F #5604: Add provision type to providers (#1565)

Browse Source
This commit is contained in:
Sergio Betanzos 2021-11-08 11:42:16 +01:00 committed by GitHub
parent bff9c88ffa
commit 7228e670cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/fireedge/src/client/components/Forms/Provider/CreateForm/Steps/Template/index.js
View File

@ -26,7 +26,7 @@ import { useAuth } from 'client/features/Auth'
import { useProvisionTemplate } from 'client/features/One'
import { ListCards } from 'client/components/List'
import { ProvisionTemplateCard } from 'client/components/Cards'
import { sanitize } from 'client/utils'
import { sanitize, deepmerge } from 'client/utils'
import { isValidProviderTemplate, getProvisionTypeFromTemplate } from 'client/models/ProviderTemplate'
import { T } from 'client/constants'
@ -107,6 +107,7 @@ const Content = ({ data, setFormData }) => {
const handleClick = (template, isSelected) => {
const { name, description } = template
const extraPlainInfo = { plain: { provision_type: provisionSelected } }
// reset rest of form when change template
setFormData({
@ -116,7 +117,7 @@ const Content = ({ data, setFormData }) => {
isSelected
? handleUnselect(name)
: handleSelect(template)
: handleSelect(deepmerge(template, extraPlainInfo))
}
const RenderDescription = ({ description = '' }) => {

7
src/fireedge/src/client/components/Forms/Provision/CreateForm/Steps/Provider/index.js
View File

@ -48,10 +48,11 @@ const Provider = () => ({
return providers.filter(provider => {
const { TEMPLATE: { PLAIN = {} } } = provider ?? {}
const provisionType = [providerConfig[PLAIN.provider]?.provision_type ?? []].flat()
return PLAIN.provider === provisionTemplateSelected.provider &&
provisionType.includes(templateProvisionType)
return (
PLAIN.provider === provisionTemplateSelected.provider &&
PLAIN.provision_type === templateProvisionType
)
})
}, [])