fix: Fix workload prob card missing startUp probe

Signed-off-by: leoliu <leoliu@yunify.com>
kubesphere · Jul 15, 2020 · c8d219b · c8d219b
1 parent 95f2881
commit c8d219b
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 26 deletions.
diff --git a/src/components/Cards/Containers/Item.jsx b/src/components/Cards/Containers/Item.jsx
@@ -77,19 +77,32 @@ export default class ContainerItem extends React.Component {
   }
 
   renderProbe() {
-    const { livenessProbe, readinessProbe } = this.props.detail
+    const { livenessProbe, readinessProbe, startupProbe } = this.props.detail
 
-    if (!livenessProbe && !readinessProbe) return null
+    if (!livenessProbe && !readinessProbe && !startupProbe) return null
 
     return (
       <div className={styles.probe}>
-        {this.renderProbeRecord(readinessProbe, 'readiness')}
-        {this.renderProbeRecord(livenessProbe, 'liveness')}
+        {this.renderProbeRecord({
+          probe: readinessProbe,
+          title: t('Readiness Probe'),
+          tagType: 'primary',
+        })}
+        {this.renderProbeRecord({
+          probe: livenessProbe,
+          title: t('Liveness Probe'),
+          tagType: 'warning',
+        })}
+        {this.renderProbeRecord({
+          probe: startupProbe,
+          title: t('Startup Probe'),
+          tagType: 'info',
+        })}
       </div>
     )
   }
 
-  renderProbeRecord(probe, type) {
+  renderProbeRecord({ probe, title, tagType }) {
     if (!probe) return null
 
     const delay = probe.initialDelaySeconds || 0
@@ -113,9 +126,7 @@ export default class ContainerItem extends React.Component {
     return (
       <div className={styles.probeItem}>
         <div>
-          <Tag type={type === 'liveness' ? 'warning' : 'primary'}>
-            {type === 'liveness' ? t('Liveness Probe') : t('Readiness Probe')}
-          </Tag>
+          <Tag type={tagType}>{title}</Tag>
           <span className={styles.probeType}>{t(probeType)}</span>
           <span className={styles.probeTime}>
             {t('Initial Delay')}: {delay}s &nbsp;&nbsp;

diff --git a/src/locales/en/workload.js b/src/locales/en/workload.js
@@ -302,6 +302,7 @@ export default {
   'Specify Replicas Number': 'Specify Replicas Number',
   startingDeadlineSeconds: 'startingDeadlineSeconds',
   'startingDeadlineSeconds(s)': 'startingDeadlineSeconds(s)',
+  'Startup Probe': 'Startup Probe',
   'Storage Size': 'Storage Size',
   'Strategy Type': 'Strategy Type',
   'sub path': 'sub path',

diff --git a/src/locales/tc/workload.js b/src/locales/tc/workload.js
@@ -369,6 +369,7 @@ export default {
   PROBE_TIME: '初始延时: {delay}s 超时时间:{timeout}s',
   'Readiness Probe': '就绪探针',
   'Liveness Probe': '存活探针',
+  'Startup Probe': '启动探针',
 
   INITIAL_DELAY_DESC: '在检查其运行状况之前，容器启动后需要等待多长时间。',
   TIMEOUT_DESC:

diff --git a/src/locales/zh/workload.js b/src/locales/zh/workload.js
@@ -371,6 +371,7 @@ export default {
   PROBE_TIME: '初始延时: {delay}s 超时时间:{timeout}s',
   'Readiness Probe': '就绪探针',
   'Liveness Probe': '存活探针',
+  'Startup Probe': '启动探针',
 
   INITIAL_DELAY_DESC: '在检查其运行状况之前，容器启动后需要等待多长时间。',
   TIMEOUT_DESC:

diff --git a/src/pages/projects/components/Cards/ContainerTemplate/Item.jsx b/src/pages/projects/components/Cards/ContainerTemplate/Item.jsx
@@ -40,19 +40,32 @@ export default class ContainerItem extends React.Component {
   }
 
   renderProbe() {
-    const { livenessProbe, readinessProbe } = this.props.detail
+    const { livenessProbe, readinessProbe, startupProbe } = this.props.detail
 
-    if (!livenessProbe && !readinessProbe) return null
+    if (!livenessProbe && !readinessProbe && !startupProbe) return null
 
     return (
       <div className={styles.probe}>
-        {this.renderProbeRecord(readinessProbe, 'readiness')}
-        {this.renderProbeRecord(livenessProbe, 'liveness')}
+        {this.renderProbeRecord({
+          probe: readinessProbe,
+          title: t('Readiness Probe'),
+          tagType: 'primary',
+        })}
+        {this.renderProbeRecord({
+          probe: livenessProbe,
+          title: t('Liveness Probe'),
+          tagType: 'warning',
+        })}
+        {this.renderProbeRecord({
+          probe: startupProbe,
+          title: t('Startup Probe'),
+          tagType: 'info',
+        })}
       </div>
     )
   }
 
-  renderProbeRecord(probe, type) {
+  renderProbeRecord({ probe, title, tagType }) {
     if (!probe) return null
 
     const delay = probe.initialDelaySeconds || 0
@@ -76,9 +89,7 @@ export default class ContainerItem extends React.Component {
     return (
       <div className={styles.probeItem}>
         <div>
-          <Tag type={type === 'liveness' ? 'warning' : 'primary'}>
-            {type === 'liveness' ? t('Liveness Probe') : t('Readiness Probe')}
-          </Tag>
+          <Tag type={tagType}>{title}</Tag>
           <span className={styles.probeType}>{t(probeType)}</span>
           <span className={styles.probeTime}>
             {t('Initial Delay')}: {delay}s &nbsp;&nbsp;

diff --git a/src/pages/projects/components/Cards/Probe/index.jsx b/src/pages/projects/components/Cards/Probe/index.jsx
@@ -24,19 +24,32 @@ import styles from './index.scss'
 
 export default class ProbeCard extends React.Component {
   renderProbe() {
-    const { livenessProbe, readinessProbe } = this.props.detail
+    const { livenessProbe, readinessProbe, startupProbe } = this.props.detail
 
-    if (!livenessProbe && !readinessProbe) return null
+    if (!livenessProbe && !readinessProbe && !startupProbe) return null
 
     return (
       <div className={styles.probe}>
-        {this.renderProbeRecord(readinessProbe, 'readiness')}
-        {this.renderProbeRecord(livenessProbe, 'liveness')}
+        {this.renderProbeRecord({
+          probe: readinessProbe,
+          title: t('Readiness Probe'),
+          tagType: 'primary',
+        })}
+        {this.renderProbeRecord({
+          probe: livenessProbe,
+          title: t('Liveness Probe'),
+          tagType: 'warning',
+        })}
+        {this.renderProbeRecord({
+          probe: startupProbe,
+          title: t('Startup Probe'),
+          tagType: 'info',
+        })}
       </div>
     )
   }
 
-  renderProbeRecord(probe, type) {
+  renderProbeRecord({ probe, title, tagType }) {
     if (!probe) return null
 
     const delay = probe.initialDelaySeconds || 0
@@ -61,11 +74,9 @@ export default class ProbeCard extends React.Component {
       details = [{ title: command.join(' '), description: t('Command') }]
     }
 
-    const title = (
+    const titleElm = (
       <>
-        <Tag type={type === 'liveness' ? 'warning' : 'primary'}>
-          {type === 'liveness' ? t('Liveness Probe') : t('Readiness Probe')}
-        </Tag>
+        <Tag type={tagType}>{title}</Tag>
         <span className={styles.probeType}>{t(probeType)}</span>
       </>
     )
@@ -79,7 +90,7 @@ export default class ProbeCard extends React.Component {
     return (
       <List.Item
         icon="monitor"
-        title={title}
+        title={titleElm}
         description={description}
         details={details}
       />