Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ Change tags page #220

Merged
merged 3 commits into from
Oct 25, 2023
Merged

✨ Change tags page #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a472df
:sparkles: Support create user and update user
tosone Oct 23, 2023
bb92b19
:sparkles: Change tags page
tosone Oct 25, 2023
3aa89ba
Merge branch 'main' into tosone
tosone Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkg/handlers/apidocs/docs.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions pkg/handlers/apidocs/swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4405,6 +4405,10 @@
"type": "string",
"example": "latest"
},
"pull_times": {
"type": "integer",
"example": 10
},
"pushed_at": {
"type": "string",
"example": "2006-01-02 15:04:05"
Expand Down
3 changes: 3 additions & 0 deletions pkg/handlers/apidocs/swagger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1037,6 +1037,9 @@ definitions:
name:
example: latest
type: string
pull_times:
example: 10
type: integer
pushed_at:
example: "2006-01-02 15:04:05"
type: string
Expand Down
1 change: 1 addition & 0 deletions pkg/handlers/tags/tags_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ func (h *handlers) ListTag(c echo.Context) error {
UpdatedAt: tag.Artifact.UpdatedAt.Format(consts.DefaultTimePattern),
},
Artifacts: artifacts,
PullTimes: tag.PullTimes,
PushedAt: tag.PushedAt.Format(consts.DefaultTimePattern),
CreatedAt: tag.CreatedAt.Format(consts.DefaultTimePattern),
UpdatedAt: tag.UpdatedAt.Format(consts.DefaultTimePattern),
Expand Down
1 change: 1 addition & 0 deletions pkg/types/tag.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ type TagItem struct {
ID int64 `json:"id" example:"1"`
Name string `json:"name" example:"latest"`
PushedAt string `json:"pushed_at" example:"2006-01-02 15:04:05"`
PullTimes int64 `json:"pull_times" example:"10"`
Artifact TagItemArtifact `json:"artifact"`
Artifacts []TagItemArtifact `json:"artifacts"`
CreatedAt string `json:"created_at" example:"2006-01-02 15:04:05"`
Expand Down
1 change: 1 addition & 0 deletions web/src/interfaces/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ export interface ITag {
name: string;
artifact: IArtifact;
artifacts: IArtifact[];
pull_times: number;
pushed_at: string;
created_at: string;
updated_at: string;
Expand Down
44 changes: 25 additions & 19 deletions web/src/pages/Tag/TableItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,25 @@ function DetailItem({ artifact }: { artifact: IArtifact }) {
let imageConfigObj = JSON.parse(artifact.config_raw) as IImageConfig;
return (
<tr className="hover:bg-gray-50 cursor-pointer">
<td className="text-left">
<td className="text-left w-[180px]">
<code className="text-xs underline underline-offset-1 text-blue-600 hover:text-blue-500">
{cutDigest(artifact.digest)}
</code>
</td>
<td className="text-right text-xs">
<td className="text-left text-xs w-[180px]">
Image
</td>
<td className="text-left text-xs w-[180px]">
<div className='flex gap-1'>
{distros(sbomObj.distro?.name) === "" ? "" : (
<img src={"/distros/" + distros(sbomObj.distro.name)} alt={sbomObj.distro.name} className="w-4 h-4 inline relative" />
)}
<div className=''>
{distroName(sbomObj.distro?.name) === "" ? "-" : distroName(sbomObj.distro.name) + " " + sbomObj.distro.version}
</div>
</div>
</td>
<td className="text-left text-xs w-[180px]">
{
imageConfigObj.os === undefined ||
imageConfigObj.architecture === undefined ||
Expand All @@ -87,30 +100,23 @@ function DetailItem({ artifact }: { artifact: IArtifact }) {
)
}
</td>
<td className="text-right text-xs">
<div className='flex flex-row-reverse gap-1'>
<div className=''>
{distroName(sbomObj.distro?.name) === "" ? "-" : distroName(sbomObj.distro.name) + " " + sbomObj.distro.version}
</div>
{distros(sbomObj.distro?.name) === "" ? "" : (
<img src={"/distros/" + distros(sbomObj.distro.name)} alt={sbomObj.distro.name} className="w-4 h-4 inline relative" />
)}
</div>
<td className="text-left text-xs w-[180px]">
Verified
</td>
<td className="text-right text-xs">
{humanFormat(artifact.blob_size || 0)}
</td>
<td className="text-right text-xs">
<td className="text-left text-xs w-[180px]">
{(artifact.pull_times || 0) > 0 ? dayjs().to(dayjs(artifact.last_pull)) : "Never pulled"}
</td>
<td className="text-right text-xs">
{/* <td className="text-right text-xs w-[180px]">
{artifact.pull_times}
</td>
<td className="text-right text-xs">
</td> */}
<td className="text-right text-xs w-[220px]">
<span className="bg-red-800 text-white text-xs font-medium mr-1 px-2 py-0.5 dark:bg-red-900 dark:text-red-300"><span>{vulnerabilityObj.critical || 0}</span> C</span>
<span className="bg-red-300 text-gray-800 text-xs font-medium mr-1 px-2 py-0.5 dark:bg-red-900 dark:text-red-300">{vulnerabilityObj.high || 0} H</span>
<span className="bg-amber-400 text-gray-800 text-xs font-medium mr-1 px-2 py-0.5 dark:bg-red-900 dark:text-red-300">{vulnerabilityObj.medium || 0} M</span>
<span className="bg-amber-200 text-gray-800 text-xs font-medium mr-1 px-2 py-0.5 dark:bg-red-900 dark:text-red-300">{vulnerabilityObj.low || 0} L</span>
<span className="bg-amber-200 text-gray-800 text-xs font-medium px-2 py-0.5 dark:bg-red-900 dark:text-red-300">{vulnerabilityObj.low || 0} L</span>
</td>
<td className="text-right text-xs w-[180px]">
{humanFormat(artifact.blob_size || 0)}
</td>
</tr>
);
Expand Down
33 changes: 21 additions & 12 deletions web/src/pages/Tag/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,36 +254,45 @@ export default function Tag({ localServer }: { localServer: string }) {
{/* first row end */}

{/* second row begin */}
<div className="text-sm text-gray-600">
<div className="text-xs text-gray-600">
Last pushed <span className="font-semibold">{dayjs().to(dayjs(tag.pushed_at))}</span>
</div>
<div className="mt-2 text-xs text-gray-600">
Pull times <span className="font-semibold">{tag.pull_times === undefined ? 0 : tag.pull_times}</span>
</div>
{/* second row end */}

{/* third row begin */}
<table className="min-w-full">
<table className="mt-2 min-w-full">
<thead>
<tr className="">
<th className="pt-5 pb-1 text-left text-xs font-medium text-gray-500 uppercase tracking-wider whitespace-nowrap">
<th className="pb-1 text-left text-xs font-medium text-gray-500 uppercase tracking-wider whitespace-nowrap">
Digest
</th>
<th className="pt-5 pb-1 text-right text-xs font-medium text-gray-500 uppercase tracking-wider whitespace-nowrap">
Os/Arch
<th className="pb-1 text-left text-xs font-medium text-gray-500 uppercase tracking-wider whitespace-nowrap">
Type
</th>
<th className="pt-5 pb-1 text-right text-xs font-medium text-gray-500 uppercase tracking-wider whitespace-nowrap">
<th className="pb-1 text-left text-xs font-medium text-gray-500 uppercase tracking-wider whitespace-nowrap">
Distro
</th>
<th className="pt-5 pb-1 text-right text-xs font-medium text-gray-500 uppercase tracking-wider whitespace-nowrap">
Size
<th className="pb-1 text-left text-xs font-medium text-gray-500 uppercase tracking-wider whitespace-nowrap">
Os/Arch
</th>
<th className="pt-5 pb-1 text-right text-xs font-medium text-gray-500 uppercase tracking-wider whitespace-nowrap">
<th className="pb-1 text-left text-xs font-medium text-gray-500 uppercase tracking-wider whitespace-nowrap">
Signing
</th>
<th className="pb-1 text-left text-xs font-medium text-gray-500 uppercase tracking-wider whitespace-nowrap">
Last pull
</th>
<th className="pt-5 pb-1 text-right text-xs font-medium text-gray-500 uppercase tracking-wider whitespace-nowrap">
{/* <th className="pb-1 text-right text-xs font-medium text-gray-500 uppercase tracking-wider whitespace-nowrap">
Pull Times
</th>
<th className="pt-5 pb-1 text-right text-xs font-medium text-gray-500 uppercase tracking-wider whitespace-nowrap">
</th> */}
<th className="pb-1 text-right text-xs font-medium text-gray-500 uppercase tracking-wider whitespace-nowrap">
Vulnerabilities
</th>
<th className="pb-1 text-right text-xs font-medium text-gray-500 uppercase tracking-wider whitespace-nowrap">
Size
</th>
</tr>
</thead>
<TableItem namespace={namespace || ""} repository={repository || ""} artifact={tag.artifact} artifacts={tag.artifacts} />
Expand Down
Loading