Fix empty container layer history and UI (#21251) (#21278)

Backport of #21251

diff --git a/modules/packages/container/metadata.go b/modules/packages/container/metadata.go
index 4222cdb30a7812c2ebe050b1f12d9c74d45785dd..fd38e678599159cdd3a0f5b7d0a30514944bd1a3 100644 (file)
--- 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 14d4a563985441f73fc208013fc500f87fedeccd..22bd50b0429fd2344cd76254fe32d292788f411b 100644 (file)
--- a/templates/package/content/container.tmpl
+++ b/templates/package/content/container.tmpl
@@ -43,7 +43,7 @@
        {{if .PackageDescriptor.Metadata.ImageLayers}}
                <h4 class="ui top attached header">{{.i18n.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>
@@ -57,7 +57,7 @@
        {{if .PackageDescriptor.Metadata.Labels}}
                <h4 class="ui top attached header">{{.i18n.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>{{.i18n.Tr "packages.container.labels.key"}}</th>

diff --git a/web_src/less/_package.less b/web_src/less/_package.less
new file mode 100644 (file)
index 0000000..f4a07a1
--- /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 4a6bd330fe830748390fac245b0f6013b14a6a33..8bdd2f564a99b577dfe7bf389a2a614b959aaf19 100644 (file)
--- a/web_src/less/index.less
+++ b/web_src/less/index.less
@@ -34,5 +34,6 @@
 @import "_admin";
 @import "_explore";
 @import "_review";
+@import "_package";
 
 @import "./helpers.less";