From d3a26a4ade7997664fe04e6f1752dd0154925977 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Thu, 21 Jun 2018 13:59:50 +0300 Subject: [PATCH] refactor(images): relocate tag/digest replacement --- app/docker/models/image.js | 10 ++++++++++ app/docker/services/imageService.js | 12 ------------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/app/docker/models/image.js b/app/docker/models/image.js index 129d1f90b..c964a331b 100644 --- a/app/docker/models/image.js +++ b/app/docker/models/image.js @@ -4,7 +4,17 @@ function ImageViewModel(data) { this.Repository = data.Repository; this.Created = data.Created; this.Checked = false; + this.RepoTags = data.RepoTags; + if (!this.RepoTags && data.RepoDigests) { + this.RepoTags = []; + for (var i = 0; i < data.RepoDigests.length; i++) { + var digest = data.RepoDigests[i]; + var repository = digest.substring(0, digest.indexOf('@')); + this.RepoTags.push(repository + ':'); + } + } + this.VirtualSize = data.VirtualSize; this.ContainerCount = data.ContainerCount; diff --git a/app/docker/services/imageService.js b/app/docker/services/imageService.js index 55e509fcc..112536cca 100644 --- a/app/docker/services/imageService.js +++ b/app/docker/services/imageService.js @@ -20,17 +20,6 @@ angular.module('portainer.docker') return deferred.promise; }; - function replaceEmptyTagsWhenPossible(item) { - if (!item.RepoTags && item.RepoDigests) { - item.RepoTags = []; - for (var iDigest = 0; iDigest < item.RepoDigests.length; iDigest++) { - var digest = item.RepoDigests[iDigest]; - var repository = digest.substring(0, digest.indexOf('@')); - item.RepoTags.push(repository + ':'); - } - } - } - service.images = function(withUsage) { var deferred = $q.defer(); @@ -49,7 +38,6 @@ angular.module('portainer.docker') item.ContainerCount++; } } - replaceEmptyTagsWhenPossible(item); return new ImageViewModel(item); });