From 1da64f2e757cf76432f0ce9ddce65a72352b5adc Mon Sep 17 00:00:00 2001 From: Yassir Hannoun Date: Fri, 22 Dec 2017 19:39:06 +0100 Subject: [PATCH] * fix(containers): display a subset of the sha images name in the containers datatable * Removed unnecessary filter * refactor(common): improve trimshasum filter * refactor(common): improve trimshasum filter --- .../containers-datatable/containersDatatable.html | 2 +- app/filters/filters.js | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/directives/ui/datatables/containers-datatable/containersDatatable.html b/app/directives/ui/datatables/containers-datatable/containersDatatable.html index a590dd4e8..354a0b2b5 100644 --- a/app/directives/ui/datatables/containers-datatable/containersDatatable.html +++ b/app/directives/ui/datatables/containers-datatable/containersDatatable.html @@ -202,7 +202,7 @@ {{ item.StackName ? item.StackName : '-' }} - {{ item.Image | hideshasum }} + {{ item.Image | trimshasum }} {{ item.IP ? item.IP : '-' }} {{ item.hostIP }} diff --git a/app/filters/filters.js b/app/filters/filters.js index e7542805b..96042da1e 100644 --- a/app/filters/filters.js +++ b/app/filters/filters.js @@ -345,4 +345,14 @@ angular.module('portainer.filters') return function (createdBy) { return createdBy.replace('/bin/sh -c #(nop) ', '').replace('/bin/sh -c ', 'RUN '); }; -}); +}) +.filter('trimshasum', function () { + 'use strict'; + return function (imageName) { + if (imageName.indexOf('sha256:') === 0) { + return imageName.substring(7, 19); + } + return imageName; + }; +}) +; \ No newline at end of file