diff --git a/client/src/pages/servapps/containers/docker-compose.jsx b/client/src/pages/servapps/containers/docker-compose.jsx
index 2bc9aed..a1d701a 100644
--- a/client/src/pages/servapps/containers/docker-compose.jsx
+++ b/client/src/pages/servapps/containers/docker-compose.jsx
@@ -63,7 +63,7 @@ const preStyle = {
marginRight: '0',
}
-const DockerComposeImport = () => {
+const DockerComposeImport = ({refresh}) => {
const [step, setStep] = useState(0);
const [isLoading, setIsLoading] = useState(false);
const [openModal, setOpenModal] = useState(false);
@@ -163,7 +163,7 @@ const DockerComposeImport = () => {
rows={20}>
}
{step === 1 &&
-
+
}
diff --git a/client/src/pages/servapps/containers/newService.jsx b/client/src/pages/servapps/containers/newService.jsx
index 2a5652e..3ce1e94 100644
--- a/client/src/pages/servapps/containers/newService.jsx
+++ b/client/src/pages/servapps/containers/newService.jsx
@@ -50,7 +50,7 @@ const preStyle = {
opacity: '1',
}
-const NewDockerService = ({service}) => {
+const NewDockerService = ({service, refresh}) => {
const { containerName } = useParams();
const [container, setContainer] = React.useState(null);
const [config, setConfig] = React.useState(null);
@@ -70,6 +70,7 @@ const NewDockerService = ({service}) => {
preRef.current.scrollTop = preRef.current.scrollHeight;
if (newlog.includes('[OPERATION SUCCEEDED]')) {
setIsDone(true);
+ refresh && refresh();
}
});
}
diff --git a/client/src/pages/servapps/servapps.jsx b/client/src/pages/servapps/servapps.jsx
index 37a80c1..96e04e4 100644
--- a/client/src/pages/servapps/servapps.jsx
+++ b/client/src/pages/servapps/servapps.jsx
@@ -151,7 +151,7 @@ const ServeApps = () => {
startIcon={}
>Start ServApp
-
+
diff --git a/client/src/utils/docker.js b/client/src/utils/docker.js
index 54298aa..305d018 100644
--- a/client/src/utils/docker.js
+++ b/client/src/utils/docker.js
@@ -20,7 +20,6 @@ export const smartDockerLogConcat = (log, newLogRaw) => {
}
return [...log, newLogRaw];
} catch (e) {
- console.log(e);
return [...log, newLogRaw];
}
}
@@ -28,12 +27,12 @@ export const smartDockerLogConcat = (log, newLogRaw) => {
export const tryParseProgressLog = (log) => {
try {
const parsedLog = JSON.parse(log);
- if (parsedLog.status && parsedLog.progress) {
- return `${parsedLog.id || ""} ${parsedLog.status} ${parsedLog.progress}`
- } else if (parsedLog.status && parsedLog.progressDetail && parsedLog.progressDetail.current) {
- return `${parsedLog.id || ""} ${parsedLog.status} ${parsedLog.progressDetail.current}/${parsedLog.progressDetail.total}`
- } else if (parsedLog.status) {
- return `${parsedLog.id || ""} ${parsedLog.status} ${parsedLog.sha256 || ""}`
+ if (parsedLog.status && parsedLog.progress && parsedLog.id) {
+ return `${parsedLog.id} ${parsedLog.status} ${parsedLog.progress}`
+ } else if (parsedLog.status && parsedLog.id && parsedLog.progressDetail && parsedLog.progressDetail.current) {
+ return `${parsedLog.id} ${parsedLog.status} ${parsedLog.progressDetail.current}/${parsedLog.progressDetail.total}`
+ } else if (parsedLog.status && parsedLog.id) {
+ return `${parsedLog.id} ${parsedLog.status} ${parsedLog.sha256 || ""}`
}
return log;
} catch (e) {
diff --git a/package.json b/package.json
index 408258a..0def8df 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cosmos-server",
- "version": "0.5.0-unstable4",
+ "version": "0.5.0-unstable5",
"description": "",
"main": "test-server.js",
"bugs": {