Fix pod details page loading (#6177)

* Fix container tcp socket undefined error * Update i18n
kubernetes · Jun 16, 2021 · af35423 · af35423
1 parent 51e6af2
commit af35423
Show file tree

Hide file tree

Showing 10 changed files with 255 additions and 247 deletions.
diff --git a/i18n/de/messages.de.xlf b/i18n/de/messages.de.xlf
@@ -3677,15 +3677,15 @@
         <target state="new">TCP Socket</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/frontend/common/components/probe/template.html</context>
-          <context context-type="linenumber">91</context>
+          <context context-type="linenumber">90</context>
         </context-group>
       </trans-unit>
       <trans-unit id="367969280410641978" datatype="html">
         <source>Exec Commands </source>
         <target state="new">Exec Commands </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/frontend/common/components/probe/template.html</context>
-          <context context-type="linenumber">104</context>
+          <context context-type="linenumber">99</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4749936818577754995" datatype="html">

diff --git a/i18n/fr/messages.fr.xlf b/i18n/fr/messages.fr.xlf
@@ -3681,15 +3681,15 @@
         <target state="new">TCP Socket</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/frontend/common/components/probe/template.html</context>
-          <context context-type="linenumber">91</context>
+          <context context-type="linenumber">90</context>
         </context-group>
       </trans-unit>
       <trans-unit id="367969280410641978" datatype="html">
         <source>Exec Commands </source>
         <target state="new">Exec Commands </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/frontend/common/components/probe/template.html</context>
-          <context context-type="linenumber">104</context>
+          <context context-type="linenumber">99</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4749936818577754995" datatype="html">

diff --git a/i18n/ja/messages.ja.xlf b/i18n/ja/messages.ja.xlf
@@ -2631,15 +2631,15 @@
         <target state="new">TCP Socket</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/frontend/common/components/probe/template.html</context>
-          <context context-type="linenumber">91</context>
+          <context context-type="linenumber">90</context>
         </context-group>
       </trans-unit>
       <trans-unit id="367969280410641978" datatype="html">
         <source>Exec Commands </source>
         <target state="new">Exec Commands </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/frontend/common/components/probe/template.html</context>
-          <context context-type="linenumber">104</context>
+          <context context-type="linenumber">99</context>
         </context-group>
       </trans-unit>
       <trans-unit id="322645671410395107" datatype="html">

diff --git a/i18n/ko/messages.ko.xlf b/i18n/ko/messages.ko.xlf
@@ -2921,15 +2921,15 @@
         <target state="new">TCP Socket</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/frontend/common/components/probe/template.html</context>
-          <context context-type="linenumber">91</context>
+          <context context-type="linenumber">90</context>
         </context-group>
       </trans-unit>
       <trans-unit id="367969280410641978" datatype="html">
         <source>Exec Commands </source>
         <target state="new">Exec Commands </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/frontend/common/components/probe/template.html</context>
-          <context context-type="linenumber">104</context>
+          <context context-type="linenumber">99</context>
         </context-group>
       </trans-unit>
       <trans-unit id="322645671410395107" datatype="html">

diff --git a/i18n/messages.xlf b/i18n/messages.xlf
diff --git a/i18n/zh-Hans/messages.zh-Hans.xlf b/i18n/zh-Hans/messages.zh-Hans.xlf
@@ -2910,15 +2910,15 @@
         <target state="new">TCP Socket</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/frontend/common/components/probe/template.html</context>
-          <context context-type="linenumber">91</context>
+          <context context-type="linenumber">90</context>
         </context-group>
       </trans-unit>
       <trans-unit id="367969280410641978" datatype="html">
         <source>Exec Commands </source>
         <target state="new">Exec Commands </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/frontend/common/components/probe/template.html</context>
-          <context context-type="linenumber">104</context>
+          <context context-type="linenumber">99</context>
         </context-group>
       </trans-unit>
       <trans-unit id="322645671410395107" datatype="html">

diff --git a/i18n/zh-Hant-HK/messages.zh-Hant-HK.xlf b/i18n/zh-Hant-HK/messages.zh-Hant-HK.xlf
@@ -2925,15 +2925,15 @@
         <target state="new">TCP Socket</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/frontend/common/components/probe/template.html</context>
-          <context context-type="linenumber">91</context>
+          <context context-type="linenumber">90</context>
         </context-group>
       </trans-unit>
       <trans-unit id="367969280410641978" datatype="html">
         <source>Exec Commands </source>
         <target state="new">Exec Commands </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/frontend/common/components/probe/template.html</context>
-          <context context-type="linenumber">104</context>
+          <context context-type="linenumber">99</context>
         </context-group>
       </trans-unit>
       <trans-unit id="322645671410395107" datatype="html">

diff --git a/i18n/zh-Hant/messages.zh-Hant.xlf b/i18n/zh-Hant/messages.zh-Hant.xlf
@@ -2921,15 +2921,15 @@
         <target state="new">TCP Socket</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/frontend/common/components/probe/template.html</context>
-          <context context-type="linenumber">91</context>
+          <context context-type="linenumber">90</context>
         </context-group>
       </trans-unit>
       <trans-unit id="367969280410641978" datatype="html">
         <source>Exec Commands </source>
         <target state="new">Exec Commands </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/frontend/common/components/probe/template.html</context>
-          <context context-type="linenumber">104</context>
+          <context context-type="linenumber">99</context>
         </context-group>
       </trans-unit>
       <trans-unit id="322645671410395107" datatype="html">

diff --git a/src/app/frontend/common/components/probe/component.ts b/src/app/frontend/common/components/probe/component.ts
@@ -41,4 +41,17 @@ export class ProbeComponent {
 
     return uri;
   }
+
+  get tcpSocketAddr(): string {
+    if (!this.probe || !this.probe.tcpSocket) {
+      return '';
+    }
+
+    let addr = this.probe.tcpSocket.host || '[host]';
+    if (this.probe.tcpSocket.port) {
+      addr += `:${this.probe.tcpSocket.port}`;
+    }
+
+    return addr;
+  }
 }
diff --git a/src/app/frontend/common/components/probe/template.html b/src/app/frontend/common/components/probe/template.html
@@ -85,16 +85,11 @@
     </ng-container>
 
     <ng-container *ngIf="probe?.tcpSocket">
-
       <kd-property>
         <div key
              i18n>TCP Socket</div>
         <div value>
-          <div *ngIf="probe?.tcpSocket?.host as value; else defaultHost">{{ value }}</div>
-          <ng-template #defaultHost>[host]</ng-template>
-          <div *ngIf="probe?.tcpSocket?.port">
-            :{{probe.httpGet.port}}
-          </div>
+          <div class="kd-code-block">{{tcpSocketAddr}}</div>
         </div>
       </kd-property>
     </ng-container>