diff --git a/src/fireedge/src/client/components/HOC/InternalLayout/index.js b/src/fireedge/src/client/components/HOC/InternalLayout/index.js index a0109ccbea..1c1d723674 100644 --- a/src/fireedge/src/client/components/HOC/InternalLayout/index.js +++ b/src/fireedge/src/client/components/HOC/InternalLayout/index.js @@ -49,7 +49,9 @@ const InternalLayout = ({ authRoute, label, children }) => { unmountOnExit > - {children} + + {children} + diff --git a/src/fireedge/src/client/components/HOC/InternalLayout/styles.js b/src/fireedge/src/client/components/HOC/InternalLayout/styles.js index e1da863d5e..6986326f37 100644 --- a/src/fireedge/src/client/components/HOC/InternalLayout/styles.js +++ b/src/fireedge/src/client/components/HOC/InternalLayout/styles.js @@ -50,6 +50,11 @@ export default makeStyles(theme => ({ color: theme.palette.primary.light } }, + container: { + height: '100%', + display: 'flex', + flexDirection: 'column' + }, /* ROUTES TRANSITIONS */ appear: {}, appearActive: {}, diff --git a/src/fireedge/src/client/components/Sidebar/index.js b/src/fireedge/src/client/components/Sidebar/index.js index c4f4769f73..273ff68493 100644 --- a/src/fireedge/src/client/components/Sidebar/index.js +++ b/src/fireedge/src/client/components/Sidebar/index.js @@ -43,8 +43,9 @@ const Sidebar = () => { const SidebarEndpoints = useMemo( () => endpoints - ?.filter( - ({ authenticated, sidebar = false }) => authenticated && sidebar + ?.filter(({ authenticated, sidebar = false }) => authenticated && sidebar) + ?.filter(({ devMode = false }) => + !devMode || (process?.env?.NODE_ENV === 'development' && devMode) ) ?.map((endpoint, index) => endpoint.routes ? ( diff --git a/src/fireedge/src/client/containers/Applications/List/Templates/index.js b/src/fireedge/src/client/containers/Applications/List/Templates/index.js deleted file mode 100644 index 9222fe0ec8..0000000000 --- a/src/fireedge/src/client/containers/Applications/List/Templates/index.js +++ /dev/null @@ -1,56 +0,0 @@ -import React, { useEffect } from 'react' - -import { useHistory } from 'react-router-dom' -import { Box, LinearProgress } from '@material-ui/core' -import { Alert } from '@material-ui/lab' - -import useApplication from 'client/hooks/useApplication' -import useFetch from 'client/hooks/useFetch' - -import ListCards from 'client/components/List/ListCards' -import { ApplicationTemplateCard } from 'client/components/Cards' -import { PATH } from 'client/router/endpoints' - -import { Tr } from 'client/components/HOC' - -const ApplicationsTemplatesList = () => { - const history = useHistory() - const { applicationsTemplates, getApplicationsTemplates } = useApplication() - const { fetchRequest, loading, error } = useFetch(getApplicationsTemplates) - - useEffect(() => { - fetchRequest() - }, []) - - if (error) { - return ( - - - {Tr('Cannot connect to OneFlow server')} - - - ) - } - - if (loading) { - return - } - - return ( - - history.push(PATH.APPLICATIONS_TEMPLATES.CREATE)} - CardComponent={ApplicationTemplateCard} - cardsProps={({ value: { ID } }) => ({ - handleEdit: () => - history.push(PATH.APPLICATIONS_TEMPLATES.EDIT.replace(':id', ID)), - handleDeploy: undefined, - handleRemove: undefined - })} - /> - - ) -} - -export default ApplicationsTemplatesList diff --git a/src/fireedge/src/client/containers/Applications/index.js b/src/fireedge/src/client/containers/Applications/index.js deleted file mode 100644 index 4f83a48bc6..0000000000 --- a/src/fireedge/src/client/containers/Applications/index.js +++ /dev/null @@ -1,73 +0,0 @@ -/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ -/* */ -/* Licensed under the Apache License, Version 2.0 (the "License"); you may */ -/* not use this file except in compliance with the License. You may obtain */ -/* a copy of the License at */ -/* */ -/* http://www.apache.org/licenses/LICENSE-2.0 */ -/* */ -/* Unless required by applicable law or agreed to in writing, software */ -/* distributed under the License is distributed on an "AS IS" BASIS, */ -/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -/* See the License for the specific language governing permissions and */ -/* limitations under the License. */ -/* -------------------------------------------------------------------------- */ - -import React, { useState } from 'react' - -import { Tab, Tabs, Paper, Container } from '@material-ui/core' - -import ApplicationsTemplatesList from 'client/containers/Applications/List/Templates' -import ApplicationsDeployed from 'client/containers/Applications/List/Deployed' - -const TABS = { - TEMPLATES: 'templates', - APPLICATIONS: 'applications' -} - -function Applications () { - const [value, setValue] = useState(TABS.TEMPLATES) - - const handleChange = (_, newValue) => { - setValue(newValue) - } - - return ( - - - - - - - - - - - ) -} - -Applications.propTypes = {} - -Applications.defaultProps = {} - -export default Applications diff --git a/src/fireedge/src/client/containers/Applications/List/Deployed/index.js b/src/fireedge/src/client/containers/ApplicationsInstances/index.js similarity index 93% rename from src/fireedge/src/client/containers/Applications/List/Deployed/index.js rename to src/fireedge/src/client/containers/ApplicationsInstances/index.js index dc263e4902..40a55ca8a7 100644 --- a/src/fireedge/src/client/containers/Applications/List/Deployed/index.js +++ b/src/fireedge/src/client/containers/ApplicationsInstances/index.js @@ -10,7 +10,7 @@ import ListCards from 'client/components/List/ListCards' import { ApplicationCard } from 'client/components/Cards' import { Tr } from 'client/components/HOC' -const ApplicationsDeployed = () => { +function ApplicationsInstances () { const { applications, getApplications } = useApplication() const { fetchRequest, loading, error } = useFetch(getApplications) @@ -45,4 +45,4 @@ const ApplicationsDeployed = () => { ) } -export default ApplicationsDeployed +export default ApplicationsInstances diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/styles.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Create/styles.js deleted file mode 100644 index 8dc409cb8c..0000000000 --- a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/styles.js +++ /dev/null @@ -1,3 +0,0 @@ -import { makeStyles } from '@material-ui/core' - -export default makeStyles(theme => ({})) diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/BasicConfiguration/index.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/BasicConfiguration/index.js similarity index 100% rename from src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/BasicConfiguration/index.js rename to src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/BasicConfiguration/index.js diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/BasicConfiguration/schema.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/BasicConfiguration/schema.js similarity index 100% rename from src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/BasicConfiguration/schema.js rename to src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/BasicConfiguration/schema.js diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Clusters/index.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Clusters/index.js similarity index 100% rename from src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Clusters/index.js rename to src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Clusters/index.js diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Clusters/schema.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Clusters/schema.js similarity index 100% rename from src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Clusters/schema.js rename to src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Clusters/schema.js diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Networking/index.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Networking/index.js similarity index 98% rename from src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Networking/index.js rename to src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Networking/index.js index 5d8f81f5ac..693a02ae72 100644 --- a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Networking/index.js +++ b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Networking/index.js @@ -9,7 +9,7 @@ import ListCards from 'client/components/List/ListCards' import { DialogForm } from 'client/components/Dialogs' import { NetworkCard } from 'client/components/Cards' -import { STEP_ID as TIERS_ID } from 'client/containers/ApplicationsTemplates/Create/Steps/Tiers' +import { STEP_ID as TIERS_ID } from 'client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers' import { FORM_FIELDS, NETWORK_FORM_SCHEMA, STEP_FORM_SCHEMA } from './schema' export const STEP_ID = 'networking' diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Networking/schema.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Networking/schema.js similarity index 100% rename from src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Networking/schema.js rename to src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Networking/schema.js diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Flow/CustomNode.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Flow/CustomNode.js similarity index 100% rename from src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Flow/CustomNode.js rename to src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Flow/CustomNode.js diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Flow/index.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Flow/index.js similarity index 98% rename from src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Flow/index.js rename to src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Flow/index.js index d050e26fd5..998997938e 100644 --- a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Flow/index.js +++ b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Flow/index.js @@ -7,7 +7,7 @@ import ReactFlow, { Background } from 'react-flow-renderer' import { useFormContext } from 'react-hook-form' import SpeedDials from 'client/components/SpeedDials' -import { STEP_ID as TIER_ID } from 'client/containers/ApplicationsTemplates/Create/Steps/Tiers' +import { STEP_ID as TIER_ID } from 'client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers' import CustomNode from './CustomNode' import useFlowGraph from './useFlowGraph' diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Flow/useFlowGraph.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Flow/useFlowGraph.js similarity index 100% rename from src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Flow/useFlowGraph.js rename to src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Flow/useFlowGraph.js diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/BasicConfiguration/index.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/BasicConfiguration/index.js similarity index 100% rename from src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/BasicConfiguration/index.js rename to src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/BasicConfiguration/index.js diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/BasicConfiguration/schema.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/BasicConfiguration/schema.js similarity index 100% rename from src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/BasicConfiguration/schema.js rename to src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/BasicConfiguration/schema.js diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/Networks/index.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Networks/index.js similarity index 94% rename from src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/Networks/index.js rename to src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Networks/index.js index d5f1875bfe..46a3cde58b 100644 --- a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/Networks/index.js +++ b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Networks/index.js @@ -4,8 +4,8 @@ import useListForm from 'client/hooks/useListForm' import ListCards from 'client/components/List/ListCards' import { SelectCard } from 'client/components/Cards' -import { STEP_ID as NETWORKING } from 'client/containers/ApplicationsTemplates/Create/Steps/Networking' -import { Context } from 'client/containers/ApplicationsTemplates/Create/Steps/Tiers' +import { STEP_ID as NETWORKING } from 'client/containers/ApplicationsTemplates/Form/Create/Steps/Networking' +import { Context } from 'client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers' import { STEP_FORM_SCHEMA } from './schema' export const STEP_ID = 'networks' diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/Networks/schema.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Networks/schema.js similarity index 100% rename from src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/Networks/schema.js rename to src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Networks/schema.js diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/Policies/index.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Policies/index.js similarity index 100% rename from src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/Policies/index.js rename to src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Policies/index.js diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/Policies/schemas/elasticity.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Policies/schemas/elasticity.js similarity index 100% rename from src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/Policies/schemas/elasticity.js rename to src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Policies/schemas/elasticity.js diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/Policies/schemas/fields.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Policies/schemas/fields.js similarity index 100% rename from src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/Policies/schemas/fields.js rename to src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Policies/schemas/fields.js diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/Policies/schemas/index.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Policies/schemas/index.js similarity index 100% rename from src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/Policies/schemas/index.js rename to src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Policies/schemas/index.js diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/Policies/schemas/scheduled.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Policies/schemas/scheduled.js similarity index 100% rename from src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/Policies/schemas/scheduled.js rename to src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Policies/schemas/scheduled.js diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/Policies/schemas/types.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Policies/schemas/types.js similarity index 100% rename from src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/Policies/schemas/types.js rename to src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Policies/schemas/types.js diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/Template/List/Docker.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Template/List/Docker.js similarity index 100% rename from src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/Template/List/Docker.js rename to src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Template/List/Docker.js diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/Template/List/MarketApps.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Template/List/MarketApps.js similarity index 100% rename from src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/Template/List/MarketApps.js rename to src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Template/List/MarketApps.js diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/Template/List/Templates.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Template/List/Templates.js similarity index 100% rename from src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/Template/List/Templates.js rename to src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Template/List/Templates.js diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/Template/index.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Template/index.js similarity index 100% rename from src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/Template/index.js rename to src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Template/index.js diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/Template/schema.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Template/schema.js similarity index 100% rename from src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/Template/schema.js rename to src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Template/schema.js diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/index.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/index.js similarity index 100% rename from src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/index.js rename to src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/index.js diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/index.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/index.js similarity index 96% rename from src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/index.js rename to src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/index.js index 4562d94b01..cc44e43c5a 100644 --- a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/Tiers/index.js +++ b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/index.js @@ -9,8 +9,8 @@ import { Box } from '@material-ui/core' import useListForm from 'client/hooks/useListForm' import FormStepper from 'client/components/FormStepper' import { DialogForm } from 'client/components/Dialogs' -import { STEP_ID as NETWORKING_ID } from 'client/containers/ApplicationsTemplates/Create/Steps/Networking' -import { STEP_ID as NETWORKS_ID } from 'client/containers/ApplicationsTemplates/Create/Steps/Tiers/Steps/Networks' +import { STEP_ID as NETWORKING_ID } from 'client/containers/ApplicationsTemplates/Form/Create/Steps/Networking' +import { STEP_ID as NETWORKS_ID } from 'client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Networks' import Steps from './Steps' import Flow from './Flow' diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/index.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/index.js similarity index 100% rename from src/fireedge/src/client/containers/ApplicationsTemplates/Create/Steps/index.js rename to src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/index.js diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/index.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/index.js similarity index 68% rename from src/fireedge/src/client/containers/ApplicationsTemplates/Create/index.js rename to src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/index.js index 7ef85e600c..d640001a46 100644 --- a/src/fireedge/src/client/containers/ApplicationsTemplates/Create/index.js +++ b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/index.js @@ -1,12 +1,12 @@ import React, { useEffect } from 'react' import { Redirect, useHistory, useParams } from 'react-router-dom' -import { Container } from '@material-ui/core' +import { LinearProgress } from '@material-ui/core' import { useForm, FormProvider } from 'react-hook-form' import { yupResolver } from '@hookform/resolvers' import FormStepper from 'client/components/FormStepper' -import Steps from 'client/containers/ApplicationsTemplates/Create/Steps' +import Steps from 'client/containers/ApplicationsTemplates/Form/Create/Steps' import { PATH } from 'client/router/endpoints' import useFetch from 'client/hooks/useFetch' @@ -14,7 +14,7 @@ import useApplication from 'client/hooks/useApplication' import mapApplicationToForm from 'client/utils/parser/toApplicationForm' import mapFormToApplication from 'client/utils/parser/toApplicationTemplate' -function ApplicationCreate () { +function ApplicationsTemplatesCreateForm () { const history = useHistory() const { id } = useParams() const { steps, defaultValues, resolvers } = Steps() @@ -38,11 +38,11 @@ function ApplicationCreate () { if (id) { updateApplicationTemplate({ id, data: application }).then( - res => res && history.push(PATH.APPLICATIONS) + res => res && history.push(PATH.APPLICATIONS_TEMPLATES.LIST) ) } else { createApplicationTemplate({ data: application }).then( - res => res && history.push(PATH.APPLICATIONS) + res => res && history.push(PATH.APPLICATIONS_TEMPLATES.LIST) ) } } @@ -60,24 +60,17 @@ function ApplicationCreate () { return } - return ( - - {(id && !data) || loading ? ( -
is loading...
- ) : ( - - - - )} -
+ return (id && !data) || loading ? ( + + ) : ( + + + ) } -ApplicationCreate.propTypes = {} +ApplicationsTemplatesCreateForm.propTypes = {} -ApplicationCreate.defaultProps = {} +ApplicationsTemplatesCreateForm.defaultProps = {} -export default ApplicationCreate +export default ApplicationsTemplatesCreateForm diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/index.js b/src/fireedge/src/client/containers/ApplicationsTemplates/index.js index 97bc868b76..e506de29f7 100644 --- a/src/fireedge/src/client/containers/ApplicationsTemplates/index.js +++ b/src/fireedge/src/client/containers/ApplicationsTemplates/index.js @@ -1,3 +1,60 @@ -import ApplicationsTemplatesCreate from 'client/containers/ApplicationsTemplates/Create' +import React, { useEffect } from 'react' -export { ApplicationsTemplatesCreate } +import { useHistory } from 'react-router-dom' +import { Box, LinearProgress } from '@material-ui/core' +import { Alert } from '@material-ui/lab' + +import { PATH } from 'client/router/endpoints' +import useApplication from 'client/hooks/useApplication' +import useFetch from 'client/hooks/useFetch' + +// import DeployForm from 'client/containers/Applications/Form' +import ListCards from 'client/components/List/ListCards' +import { ApplicationTemplateCard } from 'client/components/Cards' +import { Tr } from 'client/components/HOC' + +const ApplicationsTemplates = () => { + const history = useHistory() + // const [showDialog, setShowDialog] = useState(false) + const { applicationsTemplates, getApplicationsTemplates } = useApplication() + const { fetchRequest, loading, error } = useFetch(getApplicationsTemplates) + + useEffect(() => { + fetchRequest() + }, []) + + if (error) { + return ( + + + {Tr('Cannot connect to OneFlow server')} + + + ) + } + + if (loading) { + return + } + + return ( + + history.push(PATH.APPLICATIONS_TEMPLATES.CREATE)} + CardComponent={ApplicationTemplateCard} + cardsProps={({ value: { ID } }) => ({ + handleEdit: () => + history.push(PATH.APPLICATIONS_TEMPLATES.EDIT.replace(':id', ID)), + // handleShow: () => setShowDialog(ID), + handleRemove: undefined + })} + /> + {/* {showDialog !== false && ( + setShowDialog(false)} /> + )} */} + + ) +} + +export default ApplicationsTemplates diff --git a/src/fireedge/src/client/containers/Providers/index.js b/src/fireedge/src/client/containers/Providers/index.js new file mode 100644 index 0000000000..9756543c55 --- /dev/null +++ b/src/fireedge/src/client/containers/Providers/index.js @@ -0,0 +1,15 @@ +import React from 'react' + +import { Typography } from '@material-ui/core' + +function Providers () { + return ( + Providers + ) +} + +Providers.propTypes = {} + +Providers.defaultProps = {} + +export default Providers diff --git a/src/fireedge/src/client/containers/Provisions/index.js b/src/fireedge/src/client/containers/Provisions/index.js new file mode 100644 index 0000000000..f54087203f --- /dev/null +++ b/src/fireedge/src/client/containers/Provisions/index.js @@ -0,0 +1,15 @@ +import React from 'react' + +import { Typography } from '@material-ui/core' + +function Provisions () { + return ( + Provisions + ) +} + +Provisions.propTypes = {} + +Provisions.defaultProps = {} + +export default Provisions diff --git a/src/fireedge/src/client/router/endpoints.js b/src/fireedge/src/client/router/endpoints.js index 212ca7ef0c..9114b2890d 100644 --- a/src/fireedge/src/client/router/endpoints.js +++ b/src/fireedge/src/client/router/endpoints.js @@ -1,24 +1,10 @@ -/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ -/* */ -/* Licensed under the Apache License, Version 2.0 (the "License"); you may */ -/* not use this file except in compliance with the License. You may obtain */ -/* a copy of the License at */ -/* */ -/* http://www.apache.org/licenses/LICENSE-2.0 */ -/* */ -/* Unless required by applicable law or agreed to in writing, software */ -/* distributed under the License is distributed on an "AS IS" BASIS, */ -/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -/* See the License for the specific language governing permissions and */ -/* limitations under the License. */ -/* -------------------------------------------------------------------------- */ - import { Dashboard as DashboardIcon, - Settings as SettingsIcon, Ballot as BallotIcon, - Palette as PaletteIcon, - Reddit as RedditIcon + FormatListBulleted as TemplatesIcons, + Apps as InstancesIcons, + Public as ProvidersIcon, + SettingsSystemDaydream as ProvisionsIcon } from '@material-ui/icons' import { matchPath } from 'react-router-dom' @@ -27,17 +13,36 @@ import Dashboard from 'client/containers/Dashboard' import Settings from 'client/containers/Settings' import TestApi from 'client/containers/TestApi' import Webconsole from 'client/containers/Webconsole' -import { ApplicationsTemplatesCreate } from 'client/containers/ApplicationsTemplates' -import Applications from 'client/containers/Applications' + +import ApplicationsTemplates from 'client/containers/ApplicationsTemplates' +import ApplicationsTemplatesCreateForm from 'client/containers/ApplicationsTemplates/Form/Create' + +import ApplicationsInstances from 'client/containers/ApplicationsInstances' + +import Providers from 'client/containers/Providers' +import Provisions from 'client/containers/Provisions' export const PATH = { LOGIN: '/', DASHBOARD: '/dashboard', APPLICATIONS_TEMPLATES: { + LIST: '/applications-templates', CREATE: '/applications-templates/create', EDIT: '/applications-templates/edit/:id' }, - APPLICATIONS: '/applications', + APPLICATIONS: { + LIST: '/applications' + }, + PROVIDERS: { + LIST: '/providers', + CREATE: '/providers/create', + EDIT: '/providers/edit/:id' + }, + PROVISIONS: { + LIST: '/provisions', + CREATE: '/provisions/create', + EDIT: '/provisions/edit/:id' + }, SETTINGS: '/settings', TEST_API: '/test-api' } @@ -62,7 +67,6 @@ const ENDPOINTS = [ path: PATH.SETTINGS, authenticated: true, header: true, - icon: SettingsIcon, component: Settings }, { @@ -83,27 +87,49 @@ const ENDPOINTS = [ icon: BallotIcon, component: Webconsole }, + { + label: 'Templates', + path: PATH.APPLICATIONS_TEMPLATES.LIST, + authenticated: true, + sidebar: true, + icon: TemplatesIcons, + component: ApplicationsTemplates + }, { label: 'Create Application template', path: PATH.APPLICATIONS_TEMPLATES.CREATE, authenticated: true, - icon: PaletteIcon, - component: ApplicationsTemplatesCreate + component: ApplicationsTemplatesCreateForm }, { label: 'Edit Application template', path: PATH.APPLICATIONS_TEMPLATES.EDIT, authenticated: true, - icon: PaletteIcon, - component: ApplicationsTemplatesCreate + component: ApplicationsTemplatesCreateForm }, { - label: 'Applications', - path: PATH.APPLICATIONS, + label: 'Instances', + path: PATH.APPLICATIONS.LIST, authenticated: true, sidebar: true, - icon: RedditIcon, - component: Applications + icon: InstancesIcons, + component: ApplicationsInstances + }, + { + label: 'Providers', + path: PATH.PROVIDERS.LIST, + authenticated: true, + sidebar: true, + icon: ProvidersIcon, + component: Providers + }, + { + label: 'Provisions', + path: PATH.PROVISIONS.LIST, + authenticated: true, + sidebar: true, + icon: ProvisionsIcon, + component: Provisions } ] diff --git a/src/fireedge/src/client/utils/parser/toApplicationForm.js b/src/fireedge/src/client/utils/parser/toApplicationForm.js index 1213f8fa53..0f8f54215c 100644 --- a/src/fireedge/src/client/utils/parser/toApplicationForm.js +++ b/src/fireedge/src/client/utils/parser/toApplicationForm.js @@ -1,9 +1,9 @@ import { v4 as uuidv4 } from 'uuid' -import { STEP_ID as APPLICATION_ID } from 'client/containers/ApplicationsTemplates/Create/Steps/BasicConfiguration' -import { STEP_ID as CLUSTER_ID } from 'client/containers/ApplicationsTemplates/Create/Steps/Clusters' -import { STEP_ID as NETWORKING_ID } from 'client/containers/ApplicationsTemplates/Create/Steps/Networking' -import { STEP_ID as TIERS_ID } from 'client/containers/ApplicationsTemplates/Create/Steps/Tiers' +import { STEP_ID as APPLICATION_ID } from 'client/containers/ApplicationsTemplates/Form/Create/Steps/BasicConfiguration' +import { STEP_ID as CLUSTER_ID } from 'client/containers/ApplicationsTemplates/Form/Create/Steps/Clusters' +import { STEP_ID as NETWORKING_ID } from 'client/containers/ApplicationsTemplates/Form/Create/Steps/Networking' +import { STEP_ID as TIERS_ID } from 'client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers' import parseTemplateToObject from './templateToObject' diff --git a/src/fireedge/src/client/utils/parser/toApplicationTemplate.js b/src/fireedge/src/client/utils/parser/toApplicationTemplate.js index dc95ede0a6..addd3b276f 100644 --- a/src/fireedge/src/client/utils/parser/toApplicationTemplate.js +++ b/src/fireedge/src/client/utils/parser/toApplicationTemplate.js @@ -1,7 +1,7 @@ -import { STEP_ID as APPLICATION_ID } from 'client/containers/ApplicationsTemplates/Create/Steps/BasicConfiguration' -import { STEP_ID as CLUSTER_ID } from 'client/containers/ApplicationsTemplates/Create/Steps/Clusters' -import { STEP_ID as NETWORKING_ID } from 'client/containers/ApplicationsTemplates/Create/Steps/Networking' -import { STEP_ID as TIERS_ID } from 'client/containers/ApplicationsTemplates/Create/Steps/Tiers' +import { STEP_ID as APPLICATION_ID } from 'client/containers/ApplicationsTemplates/Form/Create/Steps/BasicConfiguration' +import { STEP_ID as CLUSTER_ID } from 'client/containers/ApplicationsTemplates/Form/Create/Steps/Clusters' +import { STEP_ID as NETWORKING_ID } from 'client/containers/ApplicationsTemplates/Form/Create/Steps/Networking' +import { STEP_ID as TIERS_ID } from 'client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers' const mapNetworkToUserInput = network => { const { mandatory, description, type, idVnet, extra } = network