[release] version 0.5.0-unstable5
This commit is contained in:
parent
62ec6ad308
commit
1ffbb8b39b
|
@ -63,7 +63,7 @@ const preStyle = {
|
||||||
marginRight: '0',
|
marginRight: '0',
|
||||||
}
|
}
|
||||||
|
|
||||||
const DockerComposeImport = () => {
|
const DockerComposeImport = ({refresh}) => {
|
||||||
const [step, setStep] = useState(0);
|
const [step, setStep] = useState(0);
|
||||||
const [isLoading, setIsLoading] = useState(false);
|
const [isLoading, setIsLoading] = useState(false);
|
||||||
const [openModal, setOpenModal] = useState(false);
|
const [openModal, setOpenModal] = useState(false);
|
||||||
|
@ -163,7 +163,7 @@ const DockerComposeImport = () => {
|
||||||
rows={20}></TextField>
|
rows={20}></TextField>
|
||||||
</Stack>}
|
</Stack>}
|
||||||
{step === 1 && <Stack spacing={2}>
|
{step === 1 && <Stack spacing={2}>
|
||||||
<NewDockerService service={service} />
|
<NewDockerService service={service} refresh={refresh}/>
|
||||||
</Stack>}
|
</Stack>}
|
||||||
</DialogContentText>
|
</DialogContentText>
|
||||||
</DialogContent>
|
</DialogContent>
|
||||||
|
|
|
@ -50,7 +50,7 @@ const preStyle = {
|
||||||
opacity: '1',
|
opacity: '1',
|
||||||
}
|
}
|
||||||
|
|
||||||
const NewDockerService = ({service}) => {
|
const NewDockerService = ({service, refresh}) => {
|
||||||
const { containerName } = useParams();
|
const { containerName } = useParams();
|
||||||
const [container, setContainer] = React.useState(null);
|
const [container, setContainer] = React.useState(null);
|
||||||
const [config, setConfig] = React.useState(null);
|
const [config, setConfig] = React.useState(null);
|
||||||
|
@ -70,6 +70,7 @@ const NewDockerService = ({service}) => {
|
||||||
preRef.current.scrollTop = preRef.current.scrollHeight;
|
preRef.current.scrollTop = preRef.current.scrollHeight;
|
||||||
if (newlog.includes('[OPERATION SUCCEEDED]')) {
|
if (newlog.includes('[OPERATION SUCCEEDED]')) {
|
||||||
setIsDone(true);
|
setIsDone(true);
|
||||||
|
refresh && refresh();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -151,7 +151,7 @@ const ServeApps = () => {
|
||||||
startIcon={<AppstoreAddOutlined />}
|
startIcon={<AppstoreAddOutlined />}
|
||||||
>Start ServApp</ResponsiveButton>
|
>Start ServApp</ResponsiveButton>
|
||||||
</Link>
|
</Link>
|
||||||
<DockerComposeImport />
|
<DockerComposeImport refresh={refreshServeApps}/>
|
||||||
</Stack>
|
</Stack>
|
||||||
|
|
||||||
<Grid2 container spacing={{xs: 1, sm: 1, md: 2 }}>
|
<Grid2 container spacing={{xs: 1, sm: 1, md: 2 }}>
|
||||||
|
|
|
@ -20,7 +20,6 @@ export const smartDockerLogConcat = (log, newLogRaw) => {
|
||||||
}
|
}
|
||||||
return [...log, newLogRaw];
|
return [...log, newLogRaw];
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log(e);
|
|
||||||
return [...log, newLogRaw];
|
return [...log, newLogRaw];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -28,12 +27,12 @@ export const smartDockerLogConcat = (log, newLogRaw) => {
|
||||||
export const tryParseProgressLog = (log) => {
|
export const tryParseProgressLog = (log) => {
|
||||||
try {
|
try {
|
||||||
const parsedLog = JSON.parse(log);
|
const parsedLog = JSON.parse(log);
|
||||||
if (parsedLog.status && parsedLog.progress) {
|
if (parsedLog.status && parsedLog.progress && parsedLog.id) {
|
||||||
return `${parsedLog.id || ""} ${parsedLog.status} ${parsedLog.progress}`
|
return `${parsedLog.id} ${parsedLog.status} ${parsedLog.progress}`
|
||||||
} else if (parsedLog.status && parsedLog.progressDetail && parsedLog.progressDetail.current) {
|
} else if (parsedLog.status && parsedLog.id && parsedLog.progressDetail && parsedLog.progressDetail.current) {
|
||||||
return `${parsedLog.id || ""} ${parsedLog.status} ${parsedLog.progressDetail.current}/${parsedLog.progressDetail.total}`
|
return `${parsedLog.id} ${parsedLog.status} ${parsedLog.progressDetail.current}/${parsedLog.progressDetail.total}`
|
||||||
} else if (parsedLog.status) {
|
} else if (parsedLog.status && parsedLog.id) {
|
||||||
return `${parsedLog.id || ""} ${parsedLog.status} ${parsedLog.sha256 || ""}`
|
return `${parsedLog.id} ${parsedLog.status} ${parsedLog.sha256 || ""}`
|
||||||
}
|
}
|
||||||
return log;
|
return log;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "cosmos-server",
|
"name": "cosmos-server",
|
||||||
"version": "0.5.0-unstable4",
|
"version": "0.5.0-unstable5",
|
||||||
"description": "",
|
"description": "",
|
||||||
"main": "test-server.js",
|
"main": "test-server.js",
|
||||||
"bugs": {
|
"bugs": {
|
||||||
|
|
Loading…
Reference in a new issue