From 904b324716933561028205b23ac10088f108a6de Mon Sep 17 00:00:00 2001
From: KN4CK3R <admin@oldschoolhack.me>
Date: Tue, 27 Sep 2022 15:03:24 +0200
Subject: [PATCH] Fix empty container layer history and UI (#21251)
Fixes #21248
---
modules/packages/container/metadata.go | 4 +++-
templates/package/content/container.tmpl | 4 ++--
web_src/less/_package.less | 9 +++++++++
web_src/less/index.less | 1 +
4 files changed, 15 insertions(+), 3 deletions(-)
create mode 100644 web_src/less/_package.less
diff --git a/modules/packages/container/metadata.go b/modules/packages/container/metadata.go
index 4222cdb30a..fd38e67859 100644
--- a/modules/packages/container/metadata.go
+++ b/modules/packages/container/metadata.go
@@ -95,7 +95,9 @@ func parseOCIImageConfig(r io.Reader) (*Metadata, error) {
if i := strings.Index(cmd, "#(nop) "); i != -1 {
cmd = strings.TrimSpace(cmd[i+7:])
}
- imageLayers = append(imageLayers, cmd)
+ if cmd != "" {
+ imageLayers = append(imageLayers, cmd)
+ }
}
metadata := &Metadata{
diff --git a/templates/package/content/container.tmpl b/templates/package/content/container.tmpl
index 939dfe4020..a79963e732 100644
--- a/templates/package/content/container.tmpl
+++ b/templates/package/content/container.tmpl
@@ -47,7 +47,7 @@
{{if .PackageDescriptor.Metadata.ImageLayers}}
<h4 class="ui top attached header">{{.locale.Tr "packages.container.layers"}}</h4>
<div class="ui attached segment">
- <table id="notice-table" class="ui very basic compact table">
+ <table class="ui very basic compact table">
<tbody>
{{range .PackageDescriptor.Metadata.ImageLayers}}
<tr>
@@ -61,7 +61,7 @@
{{if .PackageDescriptor.Metadata.Labels}}
<h4 class="ui top attached header">{{.locale.Tr "packages.container.labels"}}</h4>
<div class="ui attached segment">
- <table id="notice-table" class="ui very basic compact table">
+ <table class="ui very basic compact table container-labels">
<thead>
<tr>
<th>{{.locale.Tr "packages.container.labels.key"}}</th>
diff --git a/web_src/less/_package.less b/web_src/less/_package.less
new file mode 100644
index 0000000000..f4a07a1889
--- /dev/null
+++ b/web_src/less/_package.less
@@ -0,0 +1,9 @@
+.container-labels {
+ td:nth-child(1) {
+ vertical-align: top;
+ }
+
+ td:nth-child(2) {
+ overflow-wrap: anywhere;
+ }
+}
diff --git a/web_src/less/index.less b/web_src/less/index.less
index 4823c56173..2d670ac2d5 100644
--- a/web_src/less/index.less
+++ b/web_src/less/index.less
@@ -35,5 +35,6 @@
@import "_admin";
@import "_explore";
@import "_review";
+@import "_package";
@import "./helpers.less";