Skip to content

Commit

Permalink
fix db file upload
Browse files Browse the repository at this point in the history
  • Loading branch information
zjy365 committed Jan 8, 2024
1 parent d12b0ad commit a5c4fd1
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 20 deletions.
4 changes: 2 additions & 2 deletions frontend/providers/dbprovider/src/pages/api/minio/upload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ const upload = new UploadModel();

const minioClient = new Minio.Client({
endPoint: process.env?.MINIO_URL || 'minioapi.dev.sealos.top',
port: Number(process.env?.MINIO_PORT) || 80,
useSSL: false,
port: Number(process.env?.MINIO_PORT) || 443,
useSSL: Boolean(process.env?.MINIO_USE_SSL) || true,
accessKey: process.env?.MINIO_ACCESS_KEY || 'database',
secretKey: process.env?.MINIO_SECRET_KEY || 'database'
});
Expand Down
29 changes: 11 additions & 18 deletions frontend/providers/template/src/pages/develop/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,10 @@ export default function Develop() {
try {
const result = getYamlSource(str);
const defaultInputes = getTemplateDefaultValues(result);
const formInputs = formHook.getValues();

setYamlSource(result);
const correctYamlList = generateCorrectYamlList(result, defaultInputes);
const correctYamlList = generateCorrectYamlList(result, formInputs);
setYamlList(correctYamlList);
} catch (error: any) {
toast({
Expand All @@ -114,13 +116,9 @@ export default function Develop() {
});

// watch form change, compute new yaml
useEffect(
() =>
formHook.watch((data: any) => {
data && formOnchangeDebounce(data);
}).unsubscribe,
[formHook.watch]
);
formHook.watch((data: any) => {
data && formOnchangeDebounce(data);
});

const formOnchangeDebounce = debounce((data: any) => {
try {
Expand Down Expand Up @@ -220,8 +218,7 @@ export default function Develop() {
borderRadius={'8px'}
overflowY={'hidden'}
overflowX={'scroll'}
flex={1}
>
flex={1}>
{/* left */}
<Flex flexDirection={'column'} w="50%" borderRight={'1px solid #EFF0F1'}>
<Flex
Expand All @@ -231,8 +228,7 @@ export default function Develop() {
alignItems={'center'}
backgroundColor={'#F8FAFB'}
px="36px"
borderRadius={'8px 8px 0px 0px '}
>
borderRadius={'8px 8px 0px 0px '}>
<MyIcon name="dev" color={'#24282C'} w={'24px'} h={'24px'}></MyIcon>
<Text fontWeight={'500'} fontSize={'16px'} color={'#24282C'} ml="8px">
{t('develop.Development')}
Expand Down Expand Up @@ -262,8 +258,7 @@ export default function Develop() {
alignItems={'center'}
backgroundColor={'#F8FAFB'}
pl="42px"
borderRadius={'8px 8px 0px 0px '}
>
borderRadius={'8px 8px 0px 0px '}>
<MyIcon name="eyeShow" color={'#24282C'} w={'24px'} h={'24px'}></MyIcon>
<Text fontWeight={'500'} fontSize={'16px'} color={'#24282C'} ml="8px">
{t('develop.Preview')}
Expand All @@ -275,8 +270,7 @@ export default function Develop() {
pt="26px"
pr={{ sm: '20px', md: '60px' }}
borderBottom={'1px solid #EFF0F1'}
flexDirection={'column'}
>
flexDirection={'column'}>
<Text fontWeight={'500'} fontSize={'18px'} color={'#24282C'}>
{t('develop.Configure Form')}
</Text>
Expand All @@ -292,8 +286,7 @@ export default function Develop() {
minW={'100px'}
h={'34px'}
variant={'link'}
onClick={handleExportYaml}
>
onClick={handleExportYaml}>
{t('Export')} Yaml
</Button>
</Flex>
Expand Down

0 comments on commit a5c4fd1

Please sign in to comment.