From cd73f8eb38df7bcee669a5535fd64f43e74be71d Mon Sep 17 00:00:00 2001 From: Sergio Betanzos Date: Fri, 13 Nov 2020 14:03:47 +0100 Subject: [PATCH] F #3951: Fix provider form (#417) --- .../src/client/components/Alerts/Error.js | 23 ++++++ .../client/components/Cards/ProviderCard.js | 27 +------ .../components/FormControl/SubmitButton.js | 35 ++++++--- .../src/client/components/List/ListCards.js | 3 + .../src/client/constants/translates.js | 9 ++- .../Form/Create/Steps/Networking/schema.js | 3 +- .../Form/Deploy/Steps/Tiers/schema.js | 1 - .../src/client/containers/Dashboard/index.js | 4 +- .../src/client/containers/Login/styles.js | 1 - .../Form/Create/Steps/Connection/index.js | 51 ++++++------ .../Form/Create/Steps/Provider/index.js | 4 +- .../containers/Providers/Form/Create/index.js | 26 +++++-- .../src/client/containers/Providers/index.js | 69 +++++++++------- .../src/client/containers/Provisions/index.js | 69 +++++++++------- src/fireedge/src/client/hooks/useFetch.js | 34 ++++---- src/fireedge/src/client/hooks/useProvision.js | 30 ++++--- src/fireedge/src/client/services/provision.js | 78 +++++++++++++++++-- 17 files changed, 294 insertions(+), 173 deletions(-) create mode 100644 src/fireedge/src/client/components/Alerts/Error.js diff --git a/src/fireedge/src/client/components/Alerts/Error.js b/src/fireedge/src/client/components/Alerts/Error.js new file mode 100644 index 0000000000..8ff0682fe8 --- /dev/null +++ b/src/fireedge/src/client/components/Alerts/Error.js @@ -0,0 +1,23 @@ +import React from 'react' +import PropTypes from 'prop-types' + +import { Box } from '@material-ui/core' +import { Alert } from '@material-ui/lab' + +const AlertError = ({ children, ...props }) => ( + + + {children} + + +) + +AlertError.propTypes = { + children: PropTypes.oneOfType([PropTypes.string, PropTypes.node]) +} + +AlertError.defaultProps = { + children: 'Error!' +} + +export default AlertError diff --git a/src/fireedge/src/client/components/Cards/ProviderCard.js b/src/fireedge/src/client/components/Cards/ProviderCard.js index a483e4948d..c6b82e47f1 100644 --- a/src/fireedge/src/client/components/Cards/ProviderCard.js +++ b/src/fireedge/src/client/components/Cards/ProviderCard.js @@ -3,12 +3,10 @@ import PropTypes from 'prop-types' import { makeStyles, - Box, Fade, Button, Card, CardHeader, - CardContent, CardActions } from '@material-ui/core' import FileIcon from '@material-ui/icons/Description' @@ -26,14 +24,6 @@ const useStyles = makeStyles(theme => ({ overflowX: 'hidden', flexGrow: 1 }, - subheader: { - overflow: 'hidden', - textOverflow: 'ellipsis', - whiteSpace: 'initial', - display: '-webkit-box', - lineClamp: 2, - boxOrient: 'vertical' - }, content: { display: 'flex', gap: theme.typography.pxToRem(12) @@ -43,7 +33,7 @@ const useStyles = makeStyles(theme => ({ const ProviderCard = memo( ({ value, handleShow, handleRemove }) => { const classes = useStyles() - const { ID, NAME, DESCRIPTION } = value + const { ID, NAME } = value return ( @@ -58,19 +48,7 @@ const ProviderCard = memo( noWrap: true, title: NAME }} - subheader={DESCRIPTION} - subheaderTypographyProps={{ - variant: 'body2', - noWrap: true, - className: classes.subheader, - title: DESCRIPTION - }} /> - - - {'content'} - - {handleShow && ( +) + +ButtonComponent.propTypes = { + fab: PropTypes.bool, + children: PropTypes.any +} + +const SubmitButton = ({ isSubmitting, label, fab, ...props }) => { const classes = useStyles() return ( - + ) } SubmitButton.propTypes = { + fab: PropTypes.bool, isSubmitting: PropTypes.bool, label: PropTypes.oneOfType([PropTypes.string, PropTypes.node]) } SubmitButton.defaultProps = { + fab: false, isSubmitting: false, label: undefined } diff --git a/src/fireedge/src/client/components/List/ListCards.js b/src/fireedge/src/client/components/List/ListCards.js index 7aeab553e7..a75c253b7d 100644 --- a/src/fireedge/src/client/components/List/ListCards.js +++ b/src/fireedge/src/client/components/List/ListCards.js @@ -41,6 +41,7 @@ const ListCards = memo(({ return ( + {/* CREATE CARD COMPONENT */} {handleCreate && ( {ButtonCreateComponent ? ( @@ -56,6 +57,8 @@ const ListCards = memo(({ )} )} + + {/* LIST */} {list.length > 0 ? ( list?.map((value, index) => ( diff --git a/src/fireedge/src/client/constants/translates.js b/src/fireedge/src/client/constants/translates.js index b475e3d199..bef0f31aa5 100644 --- a/src/fireedge/src/client/constants/translates.js +++ b/src/fireedge/src/client/constants/translates.js @@ -25,7 +25,12 @@ module.exports = { CannotConnectOneFlow: 'Cannot connect to OneFlow server', NotFound: 'Not found', + /* sections */ + Dashboard: 'Dashboard', + Settings: 'Settings', + Providers: 'Providers', + Provisions: 'Provisions', + Language: 'Language', - Response: 'Response', - Settings: 'Settings' + Response: 'Response' } diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Networking/schema.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Networking/schema.js index 5cdc9bea48..d0f0cad597 100644 --- a/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Networking/schema.js +++ b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Networking/schema.js @@ -135,6 +135,5 @@ export const NETWORK_FORM_SCHEMA = yup.object( ) export const STEP_FORM_SCHEMA = yup - .array() - .of(NETWORK_FORM_SCHEMA) + .array(NETWORK_FORM_SCHEMA) .default([]) diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Deploy/Steps/Tiers/schema.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Deploy/Steps/Tiers/schema.js index a992995f54..2387a933da 100644 --- a/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Deploy/Steps/Tiers/schema.js +++ b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Deploy/Steps/Tiers/schema.js @@ -3,7 +3,6 @@ import { v4 as uuidv4 } from 'uuid' import { INPUT_TYPES } from 'client/constants' import { getValidationFromFields } from 'client/utils/helpers' -import { parseFloat } from 'window-or-global' export const ID = { name: 'id', diff --git a/src/fireedge/src/client/containers/Dashboard/index.js b/src/fireedge/src/client/containers/Dashboard/index.js index e914c67a44..a793f810f8 100644 --- a/src/fireedge/src/client/containers/Dashboard/index.js +++ b/src/fireedge/src/client/containers/Dashboard/index.js @@ -18,6 +18,8 @@ import React from 'react' import { Box, Typography } from '@material-ui/core' import dashboardStyles from 'client/containers/Dashboard/styles' +import { Tr } from 'client/components/HOC/Translate' +import { Dashboard as Title } from 'client/constants/translates' function Dashboard () { const classes = dashboardStyles() @@ -29,7 +31,7 @@ function Dashboard () { className={classes.title} data-cy="dashboard-title" > - Dashboard + {Tr(Title)} ) diff --git a/src/fireedge/src/client/containers/Login/styles.js b/src/fireedge/src/client/containers/Login/styles.js index 2e51d8328f..32d94914b9 100644 --- a/src/fireedge/src/client/containers/Login/styles.js +++ b/src/fireedge/src/client/containers/Login/styles.js @@ -37,7 +37,6 @@ export default makeStyles(theme => }, wrapperForm: { padding: theme.spacing(), - flexGrow: 1, display: 'flex', overflow: 'hidden' }, diff --git a/src/fireedge/src/client/containers/Providers/Form/Create/Steps/Connection/index.js b/src/fireedge/src/client/containers/Providers/Form/Create/Steps/Connection/index.js index a4d1123b31..30675a786b 100644 --- a/src/fireedge/src/client/containers/Providers/Form/Create/Steps/Connection/index.js +++ b/src/fireedge/src/client/containers/Providers/Form/Create/Steps/Connection/index.js @@ -9,38 +9,31 @@ import { FORM_FIELDS, STEP_FORM_SCHEMA } from './schema' export const STEP_ID = 'connection' -let ff = {} +let connection = {} -const Connection = () => { - return { - id: STEP_ID, - label: 'Connection configuration', - resolver: () => STEP_FORM_SCHEMA(ff), - optionsValidate: { abortEarly: false }, - content: useCallback(({ data, setFormData }) => { - const [fields, setFields] = useState([]) - const { providersTemplates } = useProvision() - const { watch } = useFormContext() +const Connection = () => ({ + id: STEP_ID, + label: 'Connection configuration', + resolver: () => STEP_FORM_SCHEMA(connection), + optionsValidate: { abortEarly: false }, + content: useCallback(() => { + const [fields, setFields] = useState([]) + const { providersTemplates } = useProvision() + const { watch } = useFormContext() - useEffect(() => { - const { [PROVIDER_ID]: provider } = watch() - const providerTemplate = providersTemplates - .find(({ name }) => name === provider?.[0]) + useEffect(() => { + const { [PROVIDER_ID]: provider } = watch() + const providerTemplate = providersTemplates + .find(({ name }) => name === provider?.[0]) - setFields(FORM_FIELDS(providerTemplate?.connection ?? {})) - ff = providerTemplate?.connection ?? {} - - return () => { - const connection = watch(STEP_ID) - setFormData(prev => ({ ...prev, [STEP_ID]: connection })) - } - }, []) - - return ( - - ) + connection = providerTemplate?.connection ?? {} + setFields(FORM_FIELDS(connection)) }, []) - } -} + + return ( + + ) + }, []) +}) export default Connection diff --git a/src/fireedge/src/client/containers/Providers/Form/Create/Steps/Provider/index.js b/src/fireedge/src/client/containers/Providers/Form/Create/Steps/Provider/index.js index 8ef820e12c..e4ea4516c2 100644 --- a/src/fireedge/src/client/containers/Providers/Form/Create/Steps/Provider/index.js +++ b/src/fireedge/src/client/containers/Providers/Form/Create/Steps/Provider/index.js @@ -11,6 +11,8 @@ import ListCards from 'client/components/List/ListCards' import { EmptyCard, SelectCard } from 'client/components/Cards' import { PATH } from 'client/router/provision' +import { STEP_ID as CONNECTION_ID } from 'client/containers/Providers/Form/Create/Steps/Connection' +import { STEP_ID as LOCATION_ID } from 'client/containers/Providers/Form/Create/Steps/Locations' import { STEP_FORM_SCHEMA } from './schema' export const STEP_ID = 'provider' @@ -33,7 +35,7 @@ const Provider = () => ({ useEffect(() => { fetchRequest() }, []) const handleClick = (nameTemplate, isSelected) => { - setFormData({ location: undefined, connection: undefined }) + setFormData({ [LOCATION_ID]: undefined, [CONNECTION_ID]: undefined }) isSelected ? handleUnselect(nameTemplate) : handleSelect(nameTemplate) } diff --git a/src/fireedge/src/client/containers/Providers/Form/Create/index.js b/src/fireedge/src/client/containers/Providers/Form/Create/index.js index b61a90f319..ea27552536 100644 --- a/src/fireedge/src/client/containers/Providers/Form/Create/index.js +++ b/src/fireedge/src/client/containers/Providers/Form/Create/index.js @@ -12,7 +12,7 @@ import { PATH } from 'client/router/provision' function ProviderCreateForm () { const history = useHistory() - const { createProvider } = useProvision() + const { createProvider, providersTemplates } = useProvision() const { steps, defaultValues, resolvers } = Steps() const methods = useForm({ @@ -22,8 +22,24 @@ function ProviderCreateForm () { }) const onSubmit = formData => { - console.log('formData', formData) - createProvider({ data: formData }) + const { provider, location, connection } = formData + const providerSelected = provider[0] + const locationSelected = location[0] + + const providerTemplate = providersTemplates + .find(({ name }) => name === providerSelected) ?? {} + + const formatData = { + name: `${providerSelected}_${locationSelected}`, + connection: { + ...connection, + [providerTemplate.location_key]: locationSelected, + [`${providerTemplate.location_key}_extra`]: + providerTemplate.locations[locationSelected] + } + } + + createProvider({ data: formatData }) .then(() => history.push(PATH.PROVIDERS.LIST)) } @@ -36,8 +52,4 @@ function ProviderCreateForm () { ) } -ProviderCreateForm.propTypes = {} - -ProviderCreateForm.defaultProps = {} - export default ProviderCreateForm diff --git a/src/fireedge/src/client/containers/Providers/index.js b/src/fireedge/src/client/containers/Providers/index.js index 06b27281b4..1bebb180d0 100644 --- a/src/fireedge/src/client/containers/Providers/index.js +++ b/src/fireedge/src/client/containers/Providers/index.js @@ -1,50 +1,67 @@ import React, { useEffect } from 'react' import { useHistory } from 'react-router-dom' -import { Container, Box } from '@material-ui/core' -import { Alert } from '@material-ui/lab' +import { Container, Box, Typography, Divider } from '@material-ui/core' +import RefreshIcon from '@material-ui/icons/Autorenew' import { PATH } from 'client/router/provision' import useProvision from 'client/hooks/useProvision' import useFetch from 'client/hooks/useFetch' +import SubmitButton from 'client/components/FormControl/SubmitButton' import ListCards from 'client/components/List/ListCards' +import AlertError from 'client/components/Alerts/Error' import { ProviderCard } from 'client/components/Cards' -import { Tr } from 'client/components/HOC' -const Providers = () => { +import { Tr } from 'client/components/HOC' +import { Providers as ProvidersLabel } from 'client/constants/translates' + +function Providers () { const history = useHistory() const { providers, getProviders } = useProvision() - const { fetchRequest, loading, error } = useFetch(getProviders) + const { + error, + fetchRequest, + loading, + reloading + } = useFetch(getProviders) useEffect(() => { fetchRequest() }, []) - if (error) { - return ( - - - {Tr('Cannot connect to OneProvision server')} - - - ) - } - return ( - - history.push(PATH.PROVIDERS.CREATE)} - CardComponent={ProviderCard} - cardsProps={({ value: { ID } }) => ({ - handleEdit: () => - history.push(PATH.PROVIDERS.EDIT.replace(':id', ID)), - handleRemove: undefined - })} + + fetchRequest(undefined, true)} + isSubmitting={loading || reloading} + label={} /> + + {Tr(ProvidersLabel)} + + + + + {error ? ( + + {Tr('Cannot connect to OneProvision server')} + + ) : ( + history.push(PATH.PROVIDERS.CREATE)} + CardComponent={ProviderCard} + cardsProps={({ value: { ID } }) => ({ + handleEdit: () => + history.push(PATH.PROVIDERS.EDIT.replace(':id', ID)), + handleRemove: undefined + })} + /> + )} ) diff --git a/src/fireedge/src/client/containers/Provisions/index.js b/src/fireedge/src/client/containers/Provisions/index.js index f333726f58..ab3e0f526e 100644 --- a/src/fireedge/src/client/containers/Provisions/index.js +++ b/src/fireedge/src/client/containers/Provisions/index.js @@ -1,50 +1,67 @@ import React, { useEffect } from 'react' import { useHistory } from 'react-router-dom' -import { Container, Box } from '@material-ui/core' -import { Alert } from '@material-ui/lab' +import { Container, Box, Typography, Divider } from '@material-ui/core' +import RefreshIcon from '@material-ui/icons/Autorenew' import { PATH } from 'client/router/provision' import useProvision from 'client/hooks/useProvision' import useFetch from 'client/hooks/useFetch' +import SubmitButton from 'client/components/FormControl/SubmitButton' import ListCards from 'client/components/List/ListCards' +import AlertError from 'client/components/Alerts/Error' import { ProviderCard } from 'client/components/Cards' -import { Tr } from 'client/components/HOC' -const Provisions = () => { +import { Tr } from 'client/components/HOC' +import { Providers as ProvidersLabel } from 'client/constants/translates' + +function Provisions () { const history = useHistory() const { provisions, getProvisions } = useProvision() - const { fetchRequest, loading, error } = useFetch(getProvisions) + const { + error, + fetchRequest, + loading, + reloading + } = useFetch(getProvisions) useEffect(() => { fetchRequest() }, []) - if (error) { - return ( - - - {Tr('Cannot connect to OneProvision server')} - - - ) - } - return ( - - history.push(PATH.PROVISIONS.CREATE)} - CardComponent={ProviderCard} - cardsProps={({ value: { ID } }) => ({ - handleEdit: () => - history.push(PATH.PROVISIONS.EDIT.replace(':id', ID)), - handleRemove: undefined - })} + + fetchRequest(undefined, true)} + isSubmitting={loading || reloading} + label={} /> + + {Tr(ProvidersLabel)} + + + + + {error ? ( + + {Tr('Cannot connect to OneProvision server')} + + ) : ( + history.push(PATH.PROVISIONS.CREATE)} + CardComponent={ProviderCard} + cardsProps={({ value: { ID } }) => ({ + handleEdit: () => + history.push(PATH.PROVISIONS.EDIT.replace(':id', ID)), + handleRemove: undefined + })} + /> + )} ) diff --git a/src/fireedge/src/client/hooks/useFetch.js b/src/fireedge/src/client/hooks/useFetch.js index 516ed83bf9..49a8266ab5 100644 --- a/src/fireedge/src/client/hooks/useFetch.js +++ b/src/fireedge/src/client/hooks/useFetch.js @@ -3,33 +3,31 @@ import { useState, useCallback } from 'react' const useRequest = request => { const [data, setData] = useState(undefined) const [loading, setLoading] = useState(false) + const [reloading, setReloading] = useState(false) const [error, setError] = useState(false) - const fetchRequest = useCallback( - payload => { - let ignore = false - setLoading(true) - setError(false) - + const callRequest = useCallback( + payload => request(payload) .then(response => { - if (response !== undefined && !ignore) { + if (response !== undefined) { setData(response) - } else { - setError(true) - } - }) + setError(false) + } else setError(true) + } + ) .finally(() => { setLoading(false) - }) - - return () => { - ignore = true - } - }, + setReloading(false) + }), [request] ) - return { data, fetchRequest, loading, error } + const fetchRequest = useCallback((payload, reload = false) => { + reload ? setReloading(true) : setLoading(true) + callRequest(payload) + }, []) + + return { data, fetchRequest, loading, reloading, error } } export default useRequest diff --git a/src/fireedge/src/client/hooks/useProvision.js b/src/fireedge/src/client/hooks/useProvision.js index 2ca4777bd3..9ca0ee0d20 100644 --- a/src/fireedge/src/client/hooks/useProvision.js +++ b/src/fireedge/src/client/hooks/useProvision.js @@ -48,7 +48,10 @@ export default function useOpennebula () { ({ end, start } = { end: -1, start: -1 }) => serviceProvision .getProviders({ filter, end, start }) - .then(doc => dispatch(setProviders(doc))) + .then(doc => { + dispatch(setProviders(doc)) + return doc + }) .catch(err => { dispatch(enqueueError(err ?? 'Error GET providers')) }), @@ -59,20 +62,12 @@ export default function useOpennebula () { ({ data }) => serviceProvision .createProvider({ data }) - .then(doc => { - /* dispatch( - setApplicationsTemplates( - filterBy([doc].concat(applicationsTemplates), 'ID') - ) - ) */ - - return dispatch(enqueueSuccess(`Template created - ID: ${doc?.ID}`)) - }) - .catch(err => { - dispatch( - enqueueError(err?.message ?? 'Error CREATE provider') - ) - }), + .then(doc => dispatch( + enqueueSuccess(`Template created - ID: ${doc?.ID}`)) + ) + .catch(err => dispatch( + enqueueError(err?.message ?? 'Error CREATE provider') + )), [dispatch, providers] ) @@ -88,7 +83,10 @@ export default function useOpennebula () { ({ end, start } = { end: -1, start: -1 }) => serviceProvision .getProvisions({ filter, end, start }) - .then(doc => dispatch(setProvisions(doc))) + .then(doc => { + dispatch(setProvisions(doc)) + return doc + }) .catch(err => { dispatch(enqueueError(err ?? 'Error GET providers')) }), diff --git a/src/fireedge/src/client/services/provision.js b/src/fireedge/src/client/services/provision.js index 29e5e8a5bf..9de800286a 100644 --- a/src/fireedge/src/client/services/provision.js +++ b/src/fireedge/src/client/services/provision.js @@ -1,23 +1,85 @@ +import httpCodes from 'server/utils/constants/http-codes' +import { httpMethod } from 'server/utils/constants/defaults' +import { + PROVIDER, + PROVISION, + PROVISION_TEMPLATE +} from 'server/routes/api/provision/string-routes' + +import { requestData } from 'client/utils' +import { REQUEST_ACTIONS } from 'client/constants' +const { GET, POST, PUT } = httpMethod + // -------------------------------------------- // PROVIDER REQUESTS // -------------------------------------------- -export const getProvidersTemplates = () => Promise.resolve([]) -export const getProvider = () => Promise.resolve({}) +export const getProvidersTemplates = ({ filter }) => + requestData(`/api/${PROVIDER}/template`, { + data: { filter }, + method: GET, + error: err => err?.message + }).then(res => { + if (!res?.id || res?.id !== httpCodes.ok.id) throw res -export const getProviders = () => Promise.resolve([]) - .then(res => [res?.data?.DOCUMENT_POOL?.DOCUMENT ?? []].flat()) + return res?.data ?? [] + }) + +export const getProvider = ({ id }) => + requestData(`/api/${PROVIDER}/list/${id}`, { + method: GET, + error: err => err?.message + }).then(res => { + if (!res?.id || res?.id !== httpCodes.ok.id) throw res + + return res?.data?.DOCUMENT ?? {} + }) + +export const getProviders = ({ filter }) => + requestData(`/api/${PROVIDER}/list`, { + data: { filter }, + method: GET, + error: err => err?.message + }).then(res => { + if (!res?.id || res?.id !== httpCodes.ok.id) throw res + + return [res?.data?.DOCUMENT_POOL?.DOCUMENT ?? []].flat() + }) export const createProvider = ({ data = {} }) => - Promise.resolve().then(res => res?.data?.DOCUMENT ?? {}) + requestData(`/api/${PROVIDER}/create`, { + data, + method: POST + }).then(res => { + if (!res?.id || res?.id !== httpCodes.ok.id) throw res + + return res?.data ?? {} + }) // -------------------------------------------- // PROVISION REQUESTS // -------------------------------------------- -export const getProvision = () => Promise.resolve({}) -export const getProvisions = () => Promise.resolve([]) - .then(res => [res?.data?.DOCUMENT_POOL?.DOCUMENT ?? []].flat()) +export const getProvision = ({ id }) => + requestData(`/api/${PROVISION}/list/${id}`, { + method: GET, + error: err => err?.message + }).then(res => { + if (!res?.id || res?.id !== httpCodes.ok.id) throw res + + return res?.data?.DOCUMENT ?? {} + }) + +export const getProvisions = ({ filter }) => + requestData(`/api/${PROVISION}/list`, { + data: { filter }, + method: GET, + error: err => err?.message + }).then(res => { + if (!res?.id || res?.id !== httpCodes.ok.id) throw res + + return [res?.data?.DOCUMENT_POOL?.DOCUMENT ?? []].flat() + }) export const createProvision = ({ data = {} }) => Promise.resolve().then(res => res?.data?.DOCUMENT ?? {})