changes as per review

Author: munishchouhan

pkg/filler/filler.go

@@ -17,7 +17,6 @@ package filler
 import (
 	"context"
 	"errors"
-	"html/template"
 	"log/slog"
 	"sort"
 	"strings"
@@ -61,18 +60,13 @@ func (f *Filler) TagData(ctx context.Context, repo string, tag string) (*templat
 		architecturesStr = cfg.Architecture
 	}
 
-	scanUrlStr := ""
-	if imageInfo.ScanUrls != nil {
-		scanUrlStr = strings.Join(imageInfo.ScanUrls, "")
-	}
-
 	return &templates.TagData{
 		Name:          repo,
 		Tag:           tag,
 		PullReference: imageInfo.Reference,
 		CreatedAt:     cfg.Created.Format(time.RFC3339),
 		Architectures: architecturesStr,
-		ScanUrls:      template.HTML(scanUrlStr),
+		ScanUrl:       imageInfo.ScanUrl,
 		InspectUrl:    imageInfo.InspectUrl,
 	}, nil
 }

pkg/registry/client.go

@@ -17,6 +17,7 @@ package registry
 import (
 	"context"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
+	"html/template"
 	"time"
 )
 
@@ -30,8 +31,8 @@ type ImageInfo struct {
 	Image         v1.Image
 	Reference     string
 	Architectures []string
-	ScanUrls      []string
-	InspectUrl    string
+	ScanUrl       template.HTML
+	InspectUrl    template.HTML
 }
 
 // Client interface defines methods for interacting with a container registry

pkg/registry/registry/img/inspect-icon.svg

@@ -16,14 +16,19 @@ package registry
 
 import (
 	"context"
+	"embed"
 	"fmt"
 	"github.com/google/go-containerregistry/pkg/name"
 	"github.com/google/go-containerregistry/pkg/v1/remote"
 	"github.com/seqeralabs/staticreg/pkg/cfg"
 	"github.com/seqeralabs/staticreg/pkg/registry"
+	"html/template"
 	"strings"
 )
 
+//go:embed img/*
+var icons embed.FS
+
 const defaultUserAgent = "seqera/staticreg"
 
 var (
@@ -108,27 +113,25 @@ func (c *Registry) ImageInfo(ctx context.Context, image string, tag string) (reg
 			scanUrls = append(scanUrls, c.getScanUrl(ref.String(), "", cf.Architecture))
 		}
 	}
-	inspectUrl := fmt.Sprintf("%s/view/inspect?image=%s", waveServerUrl, ref)
+	inspectIcon, _ := icons.ReadFile("img/inspect-icon.svg")
+	inspectUrl := template.HTML(fmt.Sprintf("<a href=%s/view/inspect?image=%s>%s</a>", waveServerUrl, ref, inspectIcon))
+
+	scanUrl := template.HTML(strings.Join(scanUrls, ""))
 
-	return registry.ImageInfo{Image: i, Reference: ref.String(), Architectures: architectures, ScanUrls: scanUrls, InspectUrl: inspectUrl}, nil
+	return registry.ImageInfo{Image: i, Reference: ref.String(), Architectures: architectures, ScanUrl: scanUrl, InspectUrl: inspectUrl}, nil
 }
 
 func (c *Registry) getScanUrl(ref string, digest string, platform string) string {
 
 	waveServerUrl := c.cfg.WaveServerUrl
-
+	scanIcon, _ := icons.ReadFile("img/scan-icon.svg")
 	if !strings.Contains(waveServerUrl, "https://") && !strings.Contains(waveServerUrl, "http://") {
 		waveServerUrl = "https://" + waveServerUrl
 	}
 
-	const scanSvg = `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-shield-check" viewBox="0 0 16 16">
-						<path d="M5.338 1.59a61 61 0 0 0-2.837.856.48.48 0 0 0-.328.39c-.554 4.157.726 7.19 2.253 9.188a10.7 10.7 0 0 0 2.287 2.233c.346.244.652.42.893.533q.18.085.293.118a1 1 0 0 0 .101.025 1 1 0 0 0 .1-.025q.114-.034.294-.118c.24-.113.547-.29.893-.533a10.7 10.7 0 0 0 2.287-2.233c1.527-1.997 2.807-5.031 2.253-9.188a.48.48 0 0 0-.328-.39c-.651-.213-1.75-.56-2.837-.855C9.552 1.29 8.531 1.067 8 1.067c-.53 0-1.552.223-2.662.524zM5.072.56C6.157.265 7.31 0 8 0s1.843.265 2.928.56c1.11.3 2.229.655 2.887.87a1.54 1.54 0 0 1 1.044 1.262c.596 4.477-.787 7.795-2.465 9.99a11.8 11.8 0 0 1-2.517 2.453 7 7 0 0 1-1.048.625c-.28.132-.581.24-.829.24s-.548-.108-.829-.24a7 7 0 0 1-1.048-.625 11.8 11.8 0 0 1-2.517-2.453C1.928 10.487.545 7.169 1.141 2.692A1.54 1.54 0 0 1 2.185 1.43 63 63 0 0 1 5.072.56"/>
-						<path d="M10.854 5.146a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708 0l-1.5-1.5a.5.5 0 1 1 .708-.708L7.5 7.793l2.646-2.647a.5.5 0 0 1 .708 0"/>
-					</svg>`
-
-	url := fmt.Sprintf("<a href=%s/view/scans?image=%s title=%s>%s</a>", waveServerUrl, ref, platform, scanSvg)
+	url := fmt.Sprintf("<a href=%s/view/scans?image=%s title=%s>%s</a>", waveServerUrl, ref, platform, scanIcon)
 	if digest != "" {
-		url = fmt.Sprintf("<a href=%s/view/scans?image=%s@%s title=%s>%s</a>", waveServerUrl, ref, digest, platform, scanSvg)
+		url = fmt.Sprintf("<a href=%s/view/scans?image=%s@%s title=%s>%s</a>", waveServerUrl, ref, digest, platform, scanIcon)
 	}
 	return url
 }

pkg/registry/registry/img/scan-icon.svg

@@ -66,8 +66,8 @@ type TagData struct {
 	PullReference string
 	CreatedAt     string
 	Architectures string
-	ScanUrls      template.HTML
-	InspectUrl    string
+	ScanUrl       template.HTML
+	InspectUrl    template.HTML
 }
 
 type RepositoryData struct {

pkg/registry/registry/registry.go

@@ -44,12 +44,8 @@ <h1 class="lg:text-3xl xs:text-sm font-bold tracking-tight text-gray-900"><a
                                         pull {{.PullReference}}
                                     </span>
                                 </td>
-                                <td class="p-2 font-mono text-left"><div class="inline-flex items-center space-x-2">{{.ScanUrls}}</div></td>
-                                <td class="p-2 font-mono text-left"><a href={{.InspectUrl}}>
-                                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-search" viewBox="0 0 16 16">
-                                        <path d="M11.742 10.344a6.5 6.5 0 1 0-1.397 1.398h-.001q.044.06.098.115l3.85 3.85a1 1 0 0 0 1.415-1.414l-3.85-3.85a1 1 0 0 0-.115-.1zM12 6.5a5.5 5.5 0 1 1-11 0 5.5 5.5 0 0 1 11 0"/>
-                                    </svg>
-                                </a></td>
+                                <td class="p-2 font-mono text-left"><div class="inline-flex items-center space-x-2">{{.ScanUrl}}</div></td>
+                                <td class="p-2 font-mono text-left">{{.InspectUrl}}</td>
                             </tr>
                             {{end}}
                         </tbody>