feat(types): add safe_repo_tags property to DockerImage

Author: amerkurev

app/contrib/tests/test_kvstore.py

@@ -13,7 +13,7 @@ def test_model():
     return DockerImage(
         Id='test_id',
         Created=datetime.datetime.now(),
-        RepoTags=['test_repo:tag'],
+        RepoTags=['test_repo:tag', 'test_repo:latest'],
         SharedSize=0,
         Size=100,
         containers=['test_container'],

app/contrib/tests/test_types.py

@@ -53,12 +53,39 @@ def test_docker_image():
     assert x.created == datetime(2023, 1, 1, 12, 0, tzinfo=timezone.utc)
     assert x.parent_id == 'sha256:987654321fedcba'
     assert x.repo_tags == ['image:latest', 'image:v1']
+    assert x.safe_repo_tags == x.repo_tags
     assert x.shared_size == 1000
     assert x.size == 5000
     assert x.short_id == x.id[7:19]
     assert isinstance(x.created_delta, str)
     assert x.containers == []
 
+    # repo_tags = None
+    x = DockerImage.model_validate({
+        'Id': 'sha256:123456789abcdef',
+        'Created': '2023-01-01T12:00:00Z',
+        'ParentId': 'sha256:987654321fedcba',
+        'RepoTags': None,
+        'SharedSize': 1000,
+        'Size': 5000,
+    })
+
+    assert x.repo_tags is None
+    assert x.safe_repo_tags == ['<none>:<none>']
+
+    # repo_tags = []
+    x = DockerImage.model_validate({
+        'Id': 'sha256:123456789abcdef',
+        'Created': '2023-01-01T12:00:00Z',
+        'ParentId': 'sha256:987654321fedcba',
+        'RepoTags': [],
+        'SharedSize': 1000,
+        'Size': 5000,
+    })
+
+    assert x.repo_tags == []
+    assert x.safe_repo_tags == ['<none>:<none>']
+
 
 def test_docker_image_list():
     images = [

app/contrib/types.py

@@ -34,6 +34,12 @@ def short_id(self) -> str:
     def created_delta(self) -> str:
         return naturaltime(self.created)
 
+    @property
+    def safe_repo_tags(self) -> list[str]:
+        if not self.repo_tags:  # empty list or None
+            return ['<none>:<none>']
+        return self.repo_tags
+
 
 class DockerImageList(RootModel):
     root: list[DockerImage]

app/templates/pages/images.html

@@ -19,13 +19,13 @@
             <tr>
               <td class="uk-text-nowrap mono-font">{{ item.short_id }}</td>
               <td class="uk-text-nowrap">
-                {% if item.repo_tags %}
-                  {{ item.repo_tags|join('<br>')|safe }}
-                {% else %}
-                  <span class="uk-text-muted">
-                    &lt;none&gt;:&lt;none&gt;
-                  </span>
-                {% endif %}
+                {% for repo_tag in item.safe_repo_tags %}
+                  {% if repo_tag == '<none>:<none>' %}
+                    <span class="uk-text-muted">{{ repo_tag }}</span><br>
+                  {% else %}
+                  {{ repo_tag }}<br>
+                  {% endif %}
+                {% endfor %}
               </td>
               <td class="width-1">{{ item.size }}</td>
               <td class="width-1">{{ item.shared_size }}</td>