Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: updating Application Container #605

Merged
merged 1 commit into from
Apr 17, 2024
Merged

fix: updating Application Container #605

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 31 additions & 9 deletions src/renderer/src/components/ApplicationContainer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import {
APPLICATION_PAGE_ENV_VAR,
BREAKPOINTS_HEIGHT_LG,
HEIGHT_LG,
HEIGHT_MD
HEIGHT_MD,
HOME_PATH
} from '~/ui-constants'
import { CSSTransition, SwitchTransition } from 'react-transition-group'
import typographyStyles from '~/styles/Typography.module.css'
Expand All @@ -22,7 +23,7 @@ import EnvironmentVariables from '~/components/application/environment-variables
import EditApplicationFlow from '~/components/application/edit/EditApplicationFlow'
import UpgradePlatformaticFlow from '~/components/application/upgrade-platformatic/UpgradePlatformaticFlow'
import SideBar from '~/components/ui/SideBar'
import { useParams } from 'react-router-dom'
import { useNavigate, useParams } from 'react-router-dom'
import {
callOpenApplication,
callStartApplication,
Expand All @@ -32,6 +33,7 @@ import {
} from '~/api'
import { LoadingSpinnerV2 } from '@platformatic/ui-components'
import useStackablesStore from '~/useStackablesStore'
import ErrorComponent from '~/components/screens/ErrorComponent'

function ApplicationContainer () {
const globalState = useStackablesStore()
Expand All @@ -45,6 +47,8 @@ function ApplicationContainer () {
useTemplateIdOnEdit,
setUseTemplateIdOnEdit
} = globalState

const navigate = useNavigate()
const { appId } = useParams()
const [innerLoading, setInnerLoading] = useState(true)
const applicationSelected = globalState.computed.applicationSelected
Expand All @@ -60,6 +64,8 @@ function ApplicationContainer () {
const { height: innerHeight } = useWindowDimensions()
const [showModalEditApplicationFlow, setShowModalEditApplicationFlow] = useState(false)
const [showUpgradePlatformaticFlow, setShowUpgradePlatformaticFlow] = useState(false)
const [showErrorComponent, setShowErrorComponent] = useState(false)
const [error, setError] = useState(null)

useEffect(() => {
const handlingFunction = (_, templateIdReceived) => {
Expand All @@ -84,13 +90,19 @@ function ApplicationContainer () {
useEffect(() => {
if (appId && reloadApplication) {
async function getApplication () {
setInnerLoading(true)
const applicationSelected = await callOpenApplication(appId)
const tmp = {}
tmp[appId] = applicationSelected
setApplicationsSelected(tmp)
setApplicationSelectedId(appId)
setReloadApplication(false)
try {
setInnerLoading(true)
const applicationSelected = await callOpenApplication(appId)
const tmp = {}
tmp[appId] = applicationSelected
setApplicationsSelected(tmp)
setApplicationSelectedId(appId)
setReloadApplication(false)
} catch (error) {
console.error(`Error on getApplication ${error}`)
setError(error)
setShowErrorComponent(true)
}
}
getApplication()
}
Expand Down Expand Up @@ -186,7 +198,17 @@ function ApplicationContainer () {
}
}

function handleDismiss () {
setError(null)
setShowErrorComponent(false)
navigate(HOME_PATH)
}

function renderComponent () {
if (showErrorComponent) {
return (<ErrorComponent error={error} message={error.message} onClickDismiss={() => handleDismiss()} />)
}

if (innerLoading) {
return (
<LoadingSpinnerV2
Expand Down