Skip to content

D
dashboard

凌波微步_大先生 / dashboard
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
D
dashboard

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 8e6ca18f 编写于 作者: S Sebastian Florek 提交者： Kubernetes Prow Robot
浏览文件
操作

Fix env var flicker on pod detail view (#4309)

上级 2606d1da
隐藏空白更改
内联 并排
Showing with 53 addition and 40 deletion
i18n/fr/messages.fr.xlf
浏览文件 @ 8e6ca18f
......@@ -1607,15 +1607,15 @@
<target>Variable d'environnement</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">36</context>
<context context-type="linenumber">37</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">53</context>
<context context-type="linenumber">54</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">73</context>
<context context-type="linenumber">74</context>
</context-group>
</trans-unit>
<trans-unit id="e41b42647be2b71c6929a3c7210c1f75d9cd522e" datatype="html">
......@@ -1623,7 +1623,7 @@
<target><x id="INTERPOLATION" equiv-text="{{formatSecretValue(env.value).length}}"/> octets</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">60</context>
<context context-type="linenumber">61</context>
</context-group>
</trans-unit>
<trans-unit id="47a54c2463fd16e928ac0892a2050221978933df" datatype="html">
......@@ -1631,7 +1631,7 @@
<target><x id="INTERPOLATION" equiv-text="{{env.value.length}}"/> bytes</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">80</context>
<context context-type="linenumber">81</context>
</context-group>
</trans-unit>
<trans-unit id="e5f16b542e3154cb107f4adedef050543594ffd6" datatype="html">
......@@ -1639,7 +1639,7 @@
<target>Commandes</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">88</context>
<context context-type="linenumber">89</context>
</context-group>
</trans-unit>
<trans-unit id="5c12a82c6283b5e933cda0c15e7aa6b07f8c9713" datatype="html">
......@@ -1647,7 +1647,7 @@
<target>Arguments</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">100</context>
<context context-type="linenumber">101</context>
</context-group>
</trans-unit>
<trans-unit id="986668e81481d0fd0934b4ef56b4236ccb298712" datatype="html">
......
i18n/ja/messages.ja.xlf
浏览文件 @ 8e6ca18f
......@@ -1119,15 +1119,15 @@
<target>環境変数</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">36</context>
<context context-type="linenumber">37</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">53</context>
<context context-type="linenumber">54</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">73</context>
<context context-type="linenumber">74</context>
</context-group>
</trans-unit>
<trans-unit id="e41b42647be2b71c6929a3c7210c1f75d9cd522e" datatype="html">
......@@ -1135,7 +1135,7 @@
<target><x id="INTERPOLATION" equiv-text="{{formatSecretValue(env.value).length}}"/> バイト</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">60</context>
<context context-type="linenumber">61</context>
</context-group>
</trans-unit>
<trans-unit id="47a54c2463fd16e928ac0892a2050221978933df" datatype="html">
......@@ -1143,7 +1143,7 @@
<target><x id="INTERPOLATION" equiv-text="{{env.value.length}}"/> バイト</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">80</context>
<context context-type="linenumber">81</context>
</context-group>
</trans-unit>
<trans-unit id="e5f16b542e3154cb107f4adedef050543594ffd6" datatype="html">
......@@ -1151,7 +1151,7 @@
<target>コマンド</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">88</context>
<context context-type="linenumber">89</context>
</context-group>
</trans-unit>
<trans-unit id="5c12a82c6283b5e933cda0c15e7aa6b07f8c9713" datatype="html">
......@@ -1159,7 +1159,7 @@
<target>引数</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">100</context>
<context context-type="linenumber">101</context>
</context-group>
</trans-unit>
<trans-unit id="986668e81481d0fd0934b4ef56b4236ccb298712" datatype="html">
......
i18n/ko/messages.ko.xlf
浏览文件 @ 8e6ca18f
......@@ -1311,15 +1311,15 @@
<target state="new">환경 변수</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">36</context>
<context context-type="linenumber">37</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">53</context>
<context context-type="linenumber">54</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">73</context>
<context context-type="linenumber">74</context>
</context-group>
</trans-unit>
<trans-unit id="e41b42647be2b71c6929a3c7210c1f75d9cd522e" datatype="html">
......@@ -1327,7 +1327,7 @@
<target state="new"><x id="INTERPOLATION" equiv-text="{{formatSecretValue(env.value).length}}"/> bytes</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">60</context>
<context context-type="linenumber">61</context>
</context-group>
</trans-unit>
<trans-unit id="47a54c2463fd16e928ac0892a2050221978933df" datatype="html">
......@@ -1335,7 +1335,7 @@
<target state="new"><x id="INTERPOLATION" equiv-text="{{env.value.length}}"/> bytes</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">80</context>
<context context-type="linenumber">81</context>
</context-group>
</trans-unit>
<trans-unit id="e5f16b542e3154cb107f4adedef050543594ffd6" datatype="html">
......@@ -1343,7 +1343,7 @@
<target state="new">커맨드</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">88</context>
<context context-type="linenumber">89</context>
</context-group>
</trans-unit>
<trans-unit id="5c12a82c6283b5e933cda0c15e7aa6b07f8c9713" datatype="html">
......@@ -1351,7 +1351,7 @@
<target state="new">인수</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">100</context>
<context context-type="linenumber">101</context>
</context-group>
</trans-unit>
<trans-unit id="986668e81481d0fd0934b4ef56b4236ccb298712" datatype="html">
......@@ -3336,6 +3336,7 @@
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/create/from/form/template.html</context>
<context context-type="linenumber">54</context>
......
i18n/messages.xlf
浏览文件 @ 8e6ca18f
......@@ -1214,43 +1214,43 @@
<source>Environment variable</source>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">36</context>
<context context-type="linenumber">37</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">53</context>
<context context-type="linenumber">54</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">73</context>
<context context-type="linenumber">74</context>
</context-group>
</trans-unit>
<trans-unit id="e41b42647be2b71c6929a3c7210c1f75d9cd522e" datatype="html">
<source><x id="INTERPOLATION" equiv-text="{{formatSecretValue(env.value).length}}"/> bytes</source>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">60</context>
<context context-type="linenumber">61</context>
</context-group>
</trans-unit>
<trans-unit id="47a54c2463fd16e928ac0892a2050221978933df" datatype="html">
<source><x id="INTERPOLATION" equiv-text="{{env.value.length}}"/> bytes</source>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">80</context>
<context context-type="linenumber">81</context>
</context-group>
</trans-unit>
<trans-unit id="e5f16b542e3154cb107f4adedef050543594ffd6" datatype="html">
<source>Commands</source>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">88</context>
<context context-type="linenumber">89</context>
</context-group>
</trans-unit>
<trans-unit id="5c12a82c6283b5e933cda0c15e7aa6b07f8c9713" datatype="html">
<source>Arguments</source>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">100</context>
<context context-type="linenumber">101</context>
</context-group>
</trans-unit>
<trans-unit id="986668e81481d0fd0934b4ef56b4236ccb298712" datatype="html">
......
i18n/zh/messages.zh.xlf
浏览文件 @ 8e6ca18f
......@@ -1311,15 +1311,15 @@
<target state="new">环境变量</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">36</context>
<context context-type="linenumber">37</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">53</context>
<context context-type="linenumber">54</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">73</context>
<context context-type="linenumber">74</context>
</context-group>
</trans-unit>
<trans-unit id="e41b42647be2b71c6929a3c7210c1f75d9cd522e" datatype="html">
......@@ -1327,7 +1327,7 @@
<target state="new"><x id="INTERPOLATION" equiv-text="{{formatSecretValue(env.value).length}}"/> bytes</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">60</context>
<context context-type="linenumber">61</context>
</context-group>
</trans-unit>
<trans-unit id="47a54c2463fd16e928ac0892a2050221978933df" datatype="html">
......@@ -1335,7 +1335,7 @@
<target state="new"><x id="INTERPOLATION" equiv-text="{{env.value.length}}"/> bytes</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">80</context>
<context context-type="linenumber">81</context>
</context-group>
</trans-unit>
<trans-unit id="e5f16b542e3154cb107f4adedef050543594ffd6" datatype="html">
......@@ -1343,7 +1343,7 @@
<target state="new">命令</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">88</context>
<context context-type="linenumber">89</context>
</context-group>
</trans-unit>
<trans-unit id="5c12a82c6283b5e933cda0c15e7aa6b07f8c9713" datatype="html">
......@@ -1351,7 +1351,7 @@
<target state="new">参数</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">100</context>
<context context-type="linenumber">101</context>
</context-group>
</trans-unit>
<trans-unit id="986668e81481d0fd0934b4ef56b4236ccb298712" datatype="html">
......
src/app/frontend/common/components/container/component.ts
浏览文件 @ 8e6ca18f
......@@ -47,4 +47,8 @@ export class ContainerCardComponent {
getEnvSecretHref(secretKeyRef: SecretKeyRef): string {
return this.state_.href('secret', secretKeyRef.name, this.namespace);
}
getEnvVarID(_: number, envVar: EnvVar): string {
return `${envVar.name}-${envVar.value}`;
}
}
src/app/frontend/common/components/container/template.html
浏览文件 @ 8e6ca18f
......@@ -27,7 +27,8 @@ limitations under the License.
<div value>{{container.image}}</div>
</kd-property>
<div *ngFor="let env of container?.env">
<div *ngFor="let env of container?.env;trackBy:getEnvVarID"
fxFlex="20">
<ng-container *ngIf="!isSecret(env) && !isConfigMap(env)">
<kd-property>
<div key
......
src/app/frontend/common/resources/list.ts
浏览文件 @ 8e6ca18f
......@@ -136,7 +136,10 @@ export abstract class ResourceListBase<T extends ResourceList, R extends Resourc
this.isLoading = false;
this.loaded_ = true;
this.onListChange_(data);
this.cdr_.detectChanges();
if (this.cdr_) {
this.cdr_.detectChanges();
}
});
}
......
src/app/frontend/resource/workloads/pod/detail/component.ts
浏览文件 @ 8e6ca18f
......@@ -14,7 +14,7 @@
import {Component, OnDestroy, OnInit} from '@angular/core';
import {ActivatedRoute} from '@angular/router';
import {PodDetail} from '@api/backendapi';
import {Container, PodDetail} from '@api/backendapi';
import {Subscription} from 'rxjs/Subscription';
import {ActionbarService, ResourceMeta} from '../../../../common/services/global/actionbar';
......@@ -66,4 +66,8 @@ export class PodDetailComponent implements OnInit, OnDestroy {
getNodeHref(name: string): string {
return this.kdState_.href('node', name);
}
getContainerName(_: number, container: Container): string {
return container.name;
}
}
src/app/frontend/resource/workloads/pod/detail/template.html
浏览文件 @ 8e6ca18f
......@@ -86,7 +86,7 @@ limitations under the License.
<div *ngIf="pod?.containers?.length"
class="kd-card-group-header kd-muted"
i18n>Containers</div>
<kd-container-card *ngFor="let container of pod?.containers"
<kd-container-card *ngFor="let container of pod?.containers;trackBy:getContainerName"
[container]="container"
[namespace]="pod.objectMeta.namespace"
[initialized]="isInitialized"></kd-container-card>
......@@ -94,7 +94,7 @@ limitations under the License.
<div *ngIf="pod?.initContainers?.length"
class="kd-card-group-header kd-muted"
i18n>Init containers</div>
<kd-container-card *ngFor="let container of pod?.initContainers"
<kd-container-card *ngFor="let container of pod?.initContainers;trackBy:getContainerName"
[container]="container"
[namespace]="pod.objectMeta.namespace"
[initialized]="isInitialized"></kd-container-card>
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或