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: devbox deploy bug version2 #5312

Merged
merged 5 commits into from
Dec 26, 2024
+169 −159
Merged

fix: devbox deploy bug version2 #5312

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
43eaf08
fix: bug
mlhiter Dec 25, 2024
718085b
fix: bug
mlhiter Dec 25, 2024
ffd72d9
Merge branch 'main' into bugfix/deploy-samename-bug
mlhiter Dec 26, 2024
46b952e
Merge branch 'main' into bugfix/deploy-samename-bug
mlhiter Dec 26, 2024
a30da37
fix: wrong fix
mlhiter Dec 26, 2024
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
Prev Previous commit
Next Next commit
Loading
Loading status checks…
Merge branch 'main' into bugfix/deploy-samename-bug
@mlhiter
mlhiter committed Dec 26, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
commit ffd72d94d046fef9b8890bc4ed24a2d53d0f99ac
327 changes: 169 additions & 158 deletions frontend/providers/devbox/app/[lang]/(platform)/devbox/detail/[name]/components/Version.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
import { Box, Button, Flex, MenuButton, Text, useDisclosure } from '@chakra-ui/react'
import { SealosMenu, useMessage } from '@sealos/ui'
import { useQuery } from '@tanstack/react-query'
import { customAlphabet } from 'nanoid'
import { useTranslations } from 'next-intl'
import { useCallback, useState } from 'react'
@@ -7,10 +10,10 @@ import { delDevboxVersionByName, getAppsByDevboxId } from '@/api/devbox'
import DevboxStatusTag from '@/components/DevboxStatusTag'
import MyIcon from '@/components/Icon'
import EditVersionDesModal from '@/components/modals/EditVersionDesModal'

import { DevboxVersionListItemType } from '@/types/devbox'
import ReleaseModal from '@/components/modals/releaseModal'
import MyTable from '@/components/MyTable'
import { DevboxReleaseStatusEnum } from '@/constants/devbox'
import { delDevboxVersionByName, getAppsByDevboxId, getSSHRuntimeInfo } from '@/api/devbox'
import { DevboxVersionListItemType } from '@/types/devbox'

import { useConfirm } from '@/hooks/useConfirm'
import { useLoading } from '@/hooks/useLoading'
@@ -42,8 +45,10 @@ const Version = () => {
const [apps, setApps] = useState<AppListItemType[]>([])
const [deployData, setDeployData] = useState<any>(null)
const [currentVersion, setCurrentVersion] = useState<DevboxVersionListItemType | null>(null)
const [updateTemplateRepo, setUpdateTemplateRepo] = useState<null |
Awaited<ReturnType<typeof listPrivateTemplateRepository>>['templateRepositoryList'][number]>(null)
const [updateTemplateRepo, setUpdateTemplateRepo] = useState<
| null
| Awaited<ReturnType<typeof listPrivateTemplateRepository>>['templateRepositoryList'][number]
>(null)
const createTemplateModalHandler = useDisclosure()
const selectTemplalteModalHandler = useDisclosure()
const updateTemplateModalHandler = useDisclosure()
@@ -56,10 +61,10 @@ const Version = () => {
{
refetchInterval:
devboxVersionList.length > 0 &&
!createTemplateModalHandler.isOpen &&
!updateTemplateModalHandler.isOpen &&
!selectTemplalteModalHandler.isOpen &&
devboxVersionList[0].status.value === DevboxReleaseStatusEnum.Pending
!createTemplateModalHandler.isOpen &&
!updateTemplateModalHandler.isOpen &&
!selectTemplalteModalHandler.isOpen &&
devboxVersionList[0].status.value === DevboxReleaseStatusEnum.Pending
? 3000
: false,
onSettled() {
@@ -73,11 +78,12 @@ const Version = () => {
() => {
return listPrivateTemplateRepository({
page: 1,
pageSize: 100,
pageSize: 100
})
}
)
const templateRepositoryList = listPrivateTemplateRepositoryQuery.data?.templateRepositoryList || []
const templateRepositoryList =
listPrivateTemplateRepositoryQuery.data?.templateRepositoryList || []
const handleDeploy = useCallback(
async (version: DevboxVersionListItemType) => {
// const { releaseCommand, releaseArgs } = await getSSHRuntimeInfo(devbox.runtimeVersion)
@@ -106,13 +112,13 @@ const Version = () => {
newNetworks.length > 0
? newNetworks
: [
{
port: 80,
protocol: 'http',
openPublicDomain: false,
domain: env.ingressDomain
}
],
{
port: 80,
protocol: 'http',
openPublicDomain: false,
domain: env.ingressDomain
}
],
runCMD: releaseCommand,
cmdParam: releaseArgs
}
@@ -180,133 +186,128 @@ const Version = () => {
key: string
render?: (item: DevboxVersionListItemType) => JSX.Element
}[] = [
{
title: t('version_number'),
key: 'tag',
render: (item: DevboxVersionListItemType) => (
<Box color={'grayModern.900'} pl={'12px'}>
{item.tag}
{
title: t('version_number'),
key: 'tag',
render: (item: DevboxVersionListItemType) => (
<Box color={'grayModern.900'} pl={'12px'}>
{item.tag}
</Box>
)
},
{
title: t('status'),
key: 'status',
render: (item: DevboxVersionListItemType) => (
<DevboxStatusTag status={item.status} h={'27px'} thinMode />
)
},
{
title: t('create_time'),
dataIndex: 'createTime',
key: 'createTime',
render: (item: DevboxVersionListItemType) => {
return <Text color={'grayModern.600'}>{item.createTime}</Text>
}
},
{
title: t('version_description'),
key: 'description',
render: (item: DevboxVersionListItemType) => (
<Flex alignItems="center" minH={'20px'} width={'full'}>
<Box color={'grayModern.600'} noOfLines={1} w={'0'} flex={1}>
{item.description}
</Box>
)
},
{
title: t('status'),
key: 'status',
render: (item: DevboxVersionListItemType) => (
<DevboxStatusTag status={item.status} h={'27px'} thinMode />
)
},
{
title: t('create_time'),
dataIndex: 'createTime',
key: 'createTime',
render: (item: DevboxVersionListItemType) => {
return <Text color={'grayModern.600'}>{item.createTime}</Text>
}
},
{
title: t('version_description'),
key: 'description',
render: (item: DevboxVersionListItemType) => (
<Flex alignItems="center" minH={'20px'} width={'full'}>
<Box
color={'grayModern.600'}
noOfLines={1}
w={'0'}
flex={1}
>
{item.description}
</Box>
</Flex>
)
},
{
title: t('control'),
key: 'control',
render: (item: DevboxVersionListItemType) => (
<Flex alignItems={'center'}>
<Button
mr={5}
height={'27px'}
w={'60px'}
size={'sm'}
h='32px'
fontSize={'base'}
bg={'grayModern.150'}
color={'grayModern.900'}
_hover={{
color: 'brightBlue.600'
}}
isDisabled={item.status.value !== DevboxReleaseStatusEnum.Success}
onClick={() => handleDeploy(item)}>
{t('deploy')}
</Button>
<SealosMenu
width={100}
Button={
<MenuButton as={Button} variant={'square'} boxSize={'32px'} data-group>
<MyIcon name={'more'}
color={'grayModern.600'}
</Flex>
)
},
{
title: t('control'),
key: 'control',
render: (item: DevboxVersionListItemType) => (
<Flex alignItems={'center'}>
<Button
mr={5}
height={'27px'}
w={'60px'}
size={'sm'}
h="32px"
fontSize={'base'}
bg={'grayModern.150'}
color={'grayModern.900'}
_hover={{
color: 'brightBlue.600'
}}
isDisabled={item.status.value !== DevboxReleaseStatusEnum.Success}
onClick={() => handleDeploy(item)}>
{t('deploy')}
</Button>
<SealosMenu
width={100}
Button={
<MenuButton as={Button} variant={'square'} boxSize={'32px'} data-group>
<MyIcon
name={'more'}
color={'grayModern.600'}
_groupHover={{
color: 'brightBlue.600'
}}
}}
fill={'currentcolor'}
/>
</MenuButton>
}
menuList={[
{
child: (
<>
<MyIcon name={'edit'} w={'16px'} />
<Box ml={2}>{t('edit')}</Box>
</>
),
onClick: () => {
setCurrentVersion(item)
onOpenEdit()
/>
</MenuButton>
}
menuList={[
{
child: (
<>
<MyIcon name={'edit'} w={'16px'} />
<Box ml={2}>{t('edit')}</Box>
</>
),
onClick: () => {
setCurrentVersion(item)
onOpenEdit()
}
},
{
child: (
<>
<MyIcon name={'template'} w={'16px'} />
<Box ml={2}>{t('convert_to_runtime')}</Box>
</>
),
onClick: () => {
setCurrentVersion(item)
// onOpenEdit()
// openTemplateModal({templateState: })
if (templateRepositoryList.length > 0) {
selectTemplalteModalHandler.onOpen()
} else {
createTemplateModalHandler.onOpen()
}
},
{
child: (
<>
<MyIcon name={'template'} w={'16px'} />
<Box ml={2}>{t('convert_to_runtime')}</Box>
</>
),
onClick: () => {
setCurrentVersion(item)
// onOpenEdit()
// openTemplateModal({templateState: })
if (templateRepositoryList.length > 0) {
selectTemplalteModalHandler.onOpen()
} else {
createTemplateModalHandler.onOpen()
}
}
},
{
child: (
<>
<MyIcon name={'delete'} w={'16px'} />
<Box ml={2}>{t('delete')}</Box>
</>
),
menuItemStyle: {
_hover: {
color: 'red.600',
bg: 'rgba(17, 24, 36, 0.05)'
}
},
{
child: (
<>
<MyIcon name={'delete'} w={'16px'} />
<Box ml={2}>{t('delete')}</Box>
</>
),
menuItemStyle: {
_hover: {
color: 'red.600',
bg: 'rgba(17, 24, 36, 0.05)'
}
},
onClick: () => openConfirm(() => handleDelDevboxVersion(item.name))()
}
]
onClick: () => openConfirm(() => handleDelDevboxVersion(item.name))()
}
/>
</Flex >
)
}
]
]}
/>
</Flex>
)
}
]
return (
<Box
borderWidth={1}
@@ -351,9 +352,12 @@ const Version = () => {
</Box>
</Flex>
) : (
<MyTable columns={columns} data={devboxVersionList} needRadius gridTemplateColumns={
'105px 105px 144px minmax(0, 1fr) 140px'
} />
<MyTable
columns={columns}
data={devboxVersionList}
needRadius
gridTemplateColumns={'105px 105px 144px minmax(0, 1fr) 140px'}
/>
)}
{!!currentVersion && (
<EditVersionDesModal
@@ -382,25 +386,32 @@ const Version = () => {
/>
)}
<ConfirmChild />
<CreateTemplateModal isOpen={createTemplateModalHandler.isOpen} onClose={createTemplateModalHandler.onClose} devboxReleaseName={currentVersion?.name || ''} />
{templateRepositoryList.length > 0 && <SelectTemplateModal
onOpenCreate={createTemplateModalHandler.onOpen}
onOpenUdate={(uid) => {
const repo = templateRepositoryList.find((item) => item.uid === uid)
setUpdateTemplateRepo(repo || null)
updateTemplateModalHandler.onOpen()
}}
templateRepositoryList={templateRepositoryList}
isOpen={selectTemplalteModalHandler.isOpen} onClose={
selectTemplalteModalHandler.onClose
} />}
{!!updateTemplateRepo && <UpdateTemplateRepositoryModal
templateRepository={updateTemplateRepo}
isOpen={updateTemplateModalHandler.isOpen}
onClose={updateTemplateModalHandler.onClose}
<CreateTemplateModal
isOpen={createTemplateModalHandler.isOpen}
onClose={createTemplateModalHandler.onClose}
devboxReleaseName={currentVersion?.name || ''}
/>}

/>
{templateRepositoryList.length > 0 && (
<SelectTemplateModal
onOpenCreate={createTemplateModalHandler.onOpen}
onOpenUdate={(uid) => {
const repo = templateRepositoryList.find((item) => item.uid === uid)
setUpdateTemplateRepo(repo || null)
updateTemplateModalHandler.onOpen()
}}
templateRepositoryList={templateRepositoryList}
isOpen={selectTemplalteModalHandler.isOpen}
onClose={selectTemplalteModalHandler.onClose}
/>
)}
{!!updateTemplateRepo && (
<UpdateTemplateRepositoryModal
templateRepository={updateTemplateRepo}
isOpen={updateTemplateModalHandler.isOpen}
onClose={updateTemplateModalHandler.onClose}
devboxReleaseName={currentVersion?.name || ''}
/>
)}
</Box>
)
}
You are viewing a condensed version of this merge commit. You can view the full changes here.