From c339afb562675d39c0114c5b2377ef700ebd9670 Mon Sep 17 00:00:00 2001 From: alice groux Date: Tue, 13 Apr 2021 16:09:37 +0200 Subject: [PATCH 1/2] feat(k8s): cut image name to 64 chars with truncate filter in all applications datatables --- .../application/containers-datatable/containersDatatable.html | 2 +- .../applications-datatable/applicationsDatatable.html | 2 +- .../integratedApplicationsDatatable.html | 2 +- .../node-applications-datatable/nodeApplicationsDatatable.html | 2 +- .../resourcePoolApplicationsDatatable.html | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html b/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html index e441ca663..25a1e1349 100644 --- a/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html +++ b/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html @@ -116,7 +116,7 @@ > {{ item.PodName }} {{ item.Name }} - {{ item.Image }} + {{ item.Image | truncate: 64 }} {{ item.ImagePullPolicy }} {{ item.Status }}{{ item.ResourcePool }} {{ item.Image }} + {{ item.Containers.length - 1 }}{{ item.Image | truncate: 64 }} + {{ item.Containers.length - 1 }} {{ item.ApplicationType | kubernetesApplicationTypeText }} diff --git a/app/kubernetes/components/datatables/integrated-applications-datatable/integratedApplicationsDatatable.html b/app/kubernetes/components/datatables/integrated-applications-datatable/integratedApplicationsDatatable.html index 12a0d200b..50f5e7d73 100644 --- a/app/kubernetes/components/datatables/integrated-applications-datatable/integratedApplicationsDatatable.html +++ b/app/kubernetes/components/datatables/integrated-applications-datatable/integratedApplicationsDatatable.html @@ -92,7 +92,7 @@ >{{ item.Name }} {{ item.StackName }} - {{ item.Image }} + {{ item.Image | truncate: 64 }} Loading... diff --git a/app/kubernetes/components/datatables/node-applications-datatable/nodeApplicationsDatatable.html b/app/kubernetes/components/datatables/node-applications-datatable/nodeApplicationsDatatable.html index f6f2e66ea..a17481a4c 100644 --- a/app/kubernetes/components/datatables/node-applications-datatable/nodeApplicationsDatatable.html +++ b/app/kubernetes/components/datatables/node-applications-datatable/nodeApplicationsDatatable.html @@ -119,7 +119,7 @@ {{ item.ResourcePool }} {{ item.Image }} + {{ item.Containers.length - 1 }}{{ item.Image | truncate: 64 }} + {{ item.Containers.length - 1 }} {{ item.CPU | kubernetesApplicationCPUValue }} {{ item.Memory | humansize }} diff --git a/app/kubernetes/components/datatables/resource-pool-applications-datatable/resourcePoolApplicationsDatatable.html b/app/kubernetes/components/datatables/resource-pool-applications-datatable/resourcePoolApplicationsDatatable.html index 2ba9f703b..7c2f24cda 100644 --- a/app/kubernetes/components/datatables/resource-pool-applications-datatable/resourcePoolApplicationsDatatable.html +++ b/app/kubernetes/components/datatables/resource-pool-applications-datatable/resourcePoolApplicationsDatatable.html @@ -108,7 +108,7 @@ {{ item.StackName }} {{ item.Image }} + {{ item.Containers.length - 1 }}{{ item.Image | truncate: 64 }} + {{ item.Containers.length - 1 }} {{ item.CPU | kubernetesApplicationCPUValue }} {{ item.Memory | humansize }} From 872a8262f1e8861e6a01cec564212d6ffb3a25aa Mon Sep 17 00:00:00 2001 From: alice groux Date: Wed, 14 Apr 2021 14:59:17 +0200 Subject: [PATCH 2/2] feat(k8s): add full name on hovering over the image name --- .../application/containers-datatable/containersDatatable.html | 2 +- .../applications-datatable/applicationsDatatable.html | 2 +- .../integratedApplicationsDatatable.html | 2 +- .../node-applications-datatable/nodeApplicationsDatatable.html | 2 +- .../resourcePoolApplicationsDatatable.html | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html b/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html index 25a1e1349..4e7c85741 100644 --- a/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html +++ b/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html @@ -116,7 +116,7 @@ > {{ item.PodName }} {{ item.Name }} - {{ item.Image | truncate: 64 }} + {{ item.Image | truncate: 64 }} {{ item.ImagePullPolicy }} {{ item.Status }} {{ item.ResourcePool }} - {{ item.Image | truncate: 64 }} + {{ item.Containers.length - 1 }} {{ item.ApplicationType | kubernetesApplicationTypeText }} diff --git a/app/kubernetes/components/datatables/integrated-applications-datatable/integratedApplicationsDatatable.html b/app/kubernetes/components/datatables/integrated-applications-datatable/integratedApplicationsDatatable.html index 50f5e7d73..2e29e453d 100644 --- a/app/kubernetes/components/datatables/integrated-applications-datatable/integratedApplicationsDatatable.html +++ b/app/kubernetes/components/datatables/integrated-applications-datatable/integratedApplicationsDatatable.html @@ -92,7 +92,7 @@ >{{ item.Name }} {{ item.StackName }} - {{ item.Image | truncate: 64 }} + {{ item.Image | truncate: 64 }} Loading... diff --git a/app/kubernetes/components/datatables/node-applications-datatable/nodeApplicationsDatatable.html b/app/kubernetes/components/datatables/node-applications-datatable/nodeApplicationsDatatable.html index a17481a4c..308a9e741 100644 --- a/app/kubernetes/components/datatables/node-applications-datatable/nodeApplicationsDatatable.html +++ b/app/kubernetes/components/datatables/node-applications-datatable/nodeApplicationsDatatable.html @@ -118,7 +118,7 @@ {{ item.ResourcePool }} - {{ item.Image | truncate: 64 }} + {{ item.Containers.length - 1 }} {{ item.CPU | kubernetesApplicationCPUValue }} diff --git a/app/kubernetes/components/datatables/resource-pool-applications-datatable/resourcePoolApplicationsDatatable.html b/app/kubernetes/components/datatables/resource-pool-applications-datatable/resourcePoolApplicationsDatatable.html index 7c2f24cda..02ac0411e 100644 --- a/app/kubernetes/components/datatables/resource-pool-applications-datatable/resourcePoolApplicationsDatatable.html +++ b/app/kubernetes/components/datatables/resource-pool-applications-datatable/resourcePoolApplicationsDatatable.html @@ -107,7 +107,7 @@ external {{ item.StackName }} - {{ item.Image | truncate: 64 }} + {{ item.Containers.length - 1 }} {{ item.CPU | kubernetesApplicationCPUValue }}