added expiration policy icon

Author: HenriWahl

backend/collect.py

@@ -97,26 +97,6 @@ def collect_project_container_images(project) -> dict:
     return result
 
 
-def collect_project_container_images_size(container_image: dict) -> dict:
-    """
-    get all tags of a container repository of a project
-    :param container_image:
-    :return:
-    """
-    container_image_id = container_image['id']
-    try:
-        response = gitlab_session_get(
-            f'{config.api.url}{API_SUFFIX}/registry/repositories/{container_image_id}',
-            params={'size': True})
-        pass
-        #tags[tag_name] = loads(response.text)
-        # overwrite tags with more detailed info
-        #container_image['tags'] = tags
-    except Exception as exception:
-        log.error(f"Container image data: {container_image}")
-    return container_image
-
-
 def collect_project_container_images_tag(container_image: dict) -> dict:
     """
     get all tags of a container repository of a project
@@ -275,8 +255,6 @@ def collect_container_images(projects_list: list = None) -> None:
         container_images = collect_project_container_images(project)
         if container_images:
             for container_image in container_images:
-                # add size information
-                container_image = collect_project_container_images_size(container_image)
                 # add tag information
                 container_image = collect_project_container_images_tag(container_image)
                 # only store container images which have tags

frontend/templates/container_image/meta.html

@@ -9,11 +9,18 @@
     </div>
 </div>
 {% if container_image['size'] %}
-<div class="row mb-2">
-    <div class="col" title="size">
-        <i class="bi bi-database-fill"></i> {{ container_image['size_human_readable'] }}
+    {% if container_image['project']['container_expiration_policy']['enabled'] %}
+        {% set expiration_policy_icon='bi-recycle text-success' %}
+        {% set expiration_policy_text='enabled' %}
+    {% else %}
+        {% set expiration_policy_icon='bi-infinity text-danger' %}
+        {% set expiration_policy_text='disabled' %}
+    {% endif %}
+    <div class="row mb-2">
+        <div class="col" title="summarized size of images with expiration policy {{ expiration_policy_text }}">
+            <i class="bi bi-database-fill"></i> {{ container_image['size_human_readable'] }} <i class="bi {{ expiration_policy_icon }}"></i>
+        </div>
     </div>
-</div>
 {% endif %}
 <div class="row">
     <div class="col" title="link to Gitlab repository of project">