-
-
-
- -
+
+
+

{{AppName}} diff --git a/templates/package/content/container.tmpl b/templates/package/content/container.tmpl index 0bf749cd70c1e..78c9434386404 100644 --- a/templates/package/content/container.tmpl +++ b/templates/package/content/container.tmpl @@ -23,19 +23,27 @@

- {{if .PackageDescriptor.Metadata.MultiArch}} + {{if .PackageDescriptor.Metadata.Manifests}}

{{.locale.Tr "packages.container.multi_arch"}}

-
- {{range $arch, $digest := .PackageDescriptor.Metadata.MultiArch}} -
- - {{if eq $.PackageDescriptor.Metadata.Type "oci"}} - 
docker pull {{$.RegistryHost}}/{{$.PackageDescriptor.Owner.LowerName}}/{{$.PackageDescriptor.Package.LowerName}}@{{$digest}}
+ + + + + + + + + + {{range .PackageDescriptor.Metadata.Manifests}} + + + + + {{end}} - - {{end}} - + +
{{.locale.Tr "packages.container.digest"}}{{.locale.Tr "packages.container.multi_arch"}}{{.locale.Tr "admin.packages.size"}}
{{.Digest}}{{.Platform}}{{FileSize .Size}}
{{end}} {{if .PackageDescriptor.Metadata.Description}} diff --git a/templates/package/view.tmpl b/templates/package/view.tmpl index b2a2fb1e5d57a..beadcf5c1e8a3 100644 --- a/templates/package/view.tmpl +++ b/templates/package/view.tmpl @@ -62,7 +62,9 @@ {{template "package/metadata/rubygems" .}} {{template "package/metadata/swift" .}} {{template "package/metadata/vagrant" .}} + {{if not (and (eq .PackageDescriptor.Package.Type "container") .PackageDescriptor.Metadata.Manifests)}}
{{svg "octicon-database" 16 "gt-mr-3"}} {{FileSize .PackageDescriptor.CalculateBlobSize}}
+ {{end}}
{{if not (eq .PackageDescriptor.Package.Type "container")}}
diff --git a/templates/repo/diff/comment_form.tmpl b/templates/repo/diff/comment_form.tmpl index 507e4828a76e8..394a392bb9b88 100644 --- a/templates/repo/diff/comment_form.tmpl +++ b/templates/repo/diff/comment_form.tmpl @@ -27,6 +27,7 @@ {{if $.reply}} + {{else}} {{if $.root.CurrentReview}} diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 80d1bec579552..cfc9a930484f1 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -182,7 +182,7 @@ {{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
+
{{.locale.Tr "repo.issues.filter_sort.latest"}} {{.locale.Tr "repo.issues.filter_sort.oldest"}} {{.locale.Tr "repo.issues.filter_sort.recentupdate"}} diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index cb20fb0c568e2..2ca2fa2bce70f 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -9,6 +9,13 @@ {{if not .Repository.IsArchived}}
{{if or .CanWriteIssues .CanWritePulls}} + {{if .Milestone.IsClosed}} + {{$.locale.Tr "repo.milestones.open"}} + + {{else}} + {{$.locale.Tr "repo.milestones.close"}} + + {{end}} {{.locale.Tr "repo.milestones.edit"}} {{end}} {{.locale.Tr "repo.issues.new"}} diff --git a/tests/integration/api_packages_container_test.go b/tests/integration/api_packages_container_test.go index d925fd16470a3..fe9208bb05bee 100644 --- a/tests/integration/api_packages_container_test.go +++ b/tests/integration/api_packages_container_test.go @@ -321,7 +321,7 @@ func TestPackageContainer(t *testing.T) { metadata := pd.Metadata.(*container_module.Metadata) assert.Equal(t, container_module.TypeOCI, metadata.Type) assert.Len(t, metadata.ImageLayers, 2) - assert.Empty(t, metadata.MultiArch) + assert.Empty(t, metadata.Manifests) assert.Len(t, pd.Files, 3) for _, pfd := range pd.Files { @@ -462,10 +462,22 @@ func TestPackageContainer(t *testing.T) { assert.IsType(t, &container_module.Metadata{}, pd.Metadata) metadata := pd.Metadata.(*container_module.Metadata) assert.Equal(t, container_module.TypeOCI, metadata.Type) - assert.Contains(t, metadata.MultiArch, "linux/arm/v7") - assert.Equal(t, manifestDigest, metadata.MultiArch["linux/arm/v7"]) - assert.Contains(t, metadata.MultiArch, "linux/arm64/v8") - assert.Equal(t, untaggedManifestDigest, metadata.MultiArch["linux/arm64/v8"]) + assert.Len(t, metadata.Manifests, 2) + assert.Condition(t, func() bool { + for _, m := range metadata.Manifests { + switch m.Platform { + case "linux/arm/v7": + assert.Equal(t, manifestDigest, m.Digest) + assert.EqualValues(t, 1524, m.Size) + case "linux/arm64/v8": + assert.Equal(t, untaggedManifestDigest, m.Digest) + assert.EqualValues(t, 1514, m.Size) + default: + return false + } + } + return true + }) assert.Len(t, pd.Files, 1) assert.True(t, pd.Files[0].File.IsLead) diff --git a/vitest.config.js b/vitest.config.js index 37ebfa57222f1..0cf2996b6ee88 100644 --- a/vitest.config.js +++ b/vitest.config.js @@ -2,6 +2,7 @@ import {defineConfig} from 'vitest/dist/config.js'; import {readFile} from 'node:fs/promises'; import {dataToEsm} from '@rollup/pluginutils'; import {extname} from 'node:path'; +import vue from '@vitejs/plugin-vue'; function stringPlugin() { return { @@ -28,5 +29,6 @@ export default defineConfig({ }, plugins: [ stringPlugin(), + vue(), ], }); diff --git a/web_src/js/components/RepoActionView.test.js b/web_src/js/components/RepoActionView.test.js new file mode 100644 index 0000000000000..011c20d8d193c --- /dev/null +++ b/web_src/js/components/RepoActionView.test.js @@ -0,0 +1,30 @@ +import {expect, test} from 'vitest'; + +import {ansiLogToHTML} from './RepoActionView.vue'; +import AnsiToHTML from 'ansi-to-html'; + +test('processConsoleLine', () => { + expect(ansiLogToHTML('abc')).toEqual('abc'); + expect(ansiLogToHTML('abc\n')).toEqual('abc'); + expect(ansiLogToHTML('abc\r\n')).toEqual('abc'); + expect(ansiLogToHTML('\r')).toEqual(''); + expect(ansiLogToHTML('\rx\rabc')).toEqual('x\nabc'); + expect(ansiLogToHTML('\rabc\rx\r')).toEqual('abc\nx'); + + expect(ansiLogToHTML('\x1b[30mblack\x1b[37mwhite')).toEqual('blackwhite'); + expect(ansiLogToHTML('