fix: need to distinguish s2i status and pod status

kubesphere · Feb 10, 2020 · 64c3a93 · 64c3a93
1 parent 771b358
commit 64c3a93
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/src/pages/projects/components/WorkloadStatus/index.jsx b/src/pages/projects/components/WorkloadStatus/index.jsx
@@ -27,16 +27,12 @@ import { getWorkloadStatus } from 'utils/status'
 import styles from './index.scss'
 
 export default function WorkloadStatus({ data, module }) {
-  const { status: statusResult } = getWorkloadStatus(data, module)
-
-  if (data.hasS2i) {
+  const { status: statusResult } = getWorkloadStatus(data, module) || ''
+  if (statusResult.startsWith('S2I')) {
+    const S2iStatus = statusResult.slice(4)
     return (
       <div className={styles.status}>
-        <Status
-          type={statusResult}
-          name={t(S2I_STATUS_DESC[statusResult] || statusResult)}
-          flicker
-        />
+        <Status type={S2iStatus} name={t(S2I_STATUS_DESC[S2iStatus])} flicker />
       </div>
     )
   }

diff --git a/src/utils/status.js b/src/utils/status.js
@@ -31,7 +31,7 @@ export const getDeployStatus = ({
       'Running'
     )
     if (s2iStatus !== 'Successful') {
-      return s2iStatus
+      return `S2I_${s2iStatus}`
     }
   }